Merge remote-tracking branch 'origin/CombatCommandRefactor' into CombatCommandRefactor2

Conflicts:
	src/services/ai/AIActor.java
This commit is contained in:
Treeku
2014-08-25 23:31:16 +01:00
23 changed files with 451 additions and 853 deletions
-2
View File
@@ -71,8 +71,6 @@ public class BuffService implements INetworkDispatch {
public BuffService(NGECore core) {
this.core = core;
core.commandService.registerCommand("removeBuff");
loadBuffs();
}