Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

src/services/BuffService.java

@@ -66,7 +66,7 @@ public class BuffService implements INetworkDispatch {
 			//System.out.println("Buff script doesnt exist for: " + buffName);
 			return;
 		}*/
-		
+
 		final Buff buff = new Buff(buffName, creature.getObjectID());
 		if(buff.isGroupBuff()) {
 			addGroupBuff(creature, buffName);
@@ -92,6 +92,8 @@ public class BuffService implements INetworkDispatch {
                         			if(creature.getDotByBuff(otherBuff) != null)	// reset duration when theres a dot stack
                         				creature.getDotByBuff(otherBuff).setStartTime(buff.getStartTime());
                         			
+                        		} else {
+                        			buff.setStacks(buff.getMaxStacks());
                         		}
                         	
                                 if (otherBuff.getRemainingDuration() > buff.getDuration() && otherBuff.getStacks() >= otherBuff.getMaxStacks()) {