Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multi World NPCs + patch on Player interactions

Browse Source 
Made NPCs now work properly on multiworld system. Solved multiple issues
regarding Player Shops not giving back items properly when owner exits.
Added restriction on changing channels at FM rooms, preventing shop
owner entering Cash Shop.
This commit is contained in:
ronancpl
2017-05-28 22:11:39 -03:00
parent d0396e4c36
commit 7f178a3d80
548 changed files with 340 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scripting/npc/NPCScriptManager.java
View File

@@ -64,10 +64,10 @@ public class NPCScriptManager extends AbstractScriptManager {
cms.put(c, cm);
Invocable iv = null;
if (fileName != null) {
iv = getInvocable("npc/world" + c.getWorld() + "/" + fileName + ".js", c);
iv = getInvocable("npc/" + fileName + ".js", c);
}
if (iv == null) {
iv = getInvocable("npc/world" + c.getWorld() + "/" + npc + ".js", c);
iv = getInvocable("npc/" + npc + ".js", c);
}
if (iv == null) {
FilePrinter.printError(FilePrinter.NPC_UNCODED, "NPC " + MapleLifeFactory.getNPC(npc).getName() + "(" + npc + ") is not coded.\r\n");
@@ -122,9 +122,9 @@ public class NPCScriptManager extends AbstractScriptManager {
scripts.remove(c);
if(cm.getScriptName() != null) {
resetContext("npc/world" + c.getWorld() + "/" + cm.getScriptName() + ".js", c);
resetContext("npc/" + cm.getScriptName() + ".js", c);
} else {
resetContext("npc/world" + c.getWorld() + "/" + cm.getNpc() + ".js", c);
resetContext("npc/" + cm.getNpc() + ".js", c);
}
}