Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check

This commit is contained in:
Light2
2014-04-02 18:12:08 +02:00
parent 9057ee082e
commit b245efdce6
21 changed files with 322 additions and 73 deletions
+4 -1
View File
@@ -168,6 +168,8 @@ public class SimulationService implements INetworkDispatch {
core.commandService.registerCommand("eject");
core.commandService.registerGmCommand("broadcast");
core.commandService.registerGmCommand("teleporttarget");
core.commandService.registerCommand("npcconversationselect");
core.commandService.registerCommand("npcconversationstop");
}
@@ -772,7 +774,8 @@ public class SimulationService implements INetworkDispatch {
core.removeClient(session);
object.setAttachment("disconnectTask", disconnectTask);
for(TangibleObject obj : object.getDefendersList()) object.removeDefender(obj); // temp fix for being stuck in combat
for(TangibleObject obj : new Vector<TangibleObject>(object.getDefendersList()))
object.removeDefender(obj); // temp fix for being stuck in combat
}