projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/services/ConversationService.java
+7 -3
View File
@@ -57,6 +57,7 @@ public class ConversationService implements INetworkDispatch {
if(player.getConversingNpc() != null && player.getConversingNpc() != npc)
handleEndConversation(player, player.getConversingNpc());
player.setConversingNpc(npc);
sendStartConversation(player, npc);
core.scriptService.callScript("scripts/conversation/", (String) npc.getAttachment("conversationFile"), "startConversation", core, player, npc);
}
@@ -65,16 +66,19 @@ public class ConversationService implements INetworkDispatch {
TangibleObject npc = player.getConversingNpc();
if(npc == null)
if(npc == null) {
System.out.println("npc is null");
return;
}
PyObject func = conversationHandlers.get(player);
if(func == null)
if(func == null) {
System.out.println("handler func is null");
return;
}
conversationHandlers.remove(player);
func.__call__(Py.java2py(core), Py.java2py(player), Py.java2py(npc), Py.java2py(selectionId));
}