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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/scripting/npc/NPCScriptManager.java
View File

@@ -21,7 +21,7 @@
*/
package scripting.npc;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.server.world.MaplePartyCharacter;
import scripting.AbstractScriptManager;
@@ -59,23 +59,23 @@ public class NPCScriptManager extends AbstractScriptManager {
return engine != null;
}
public boolean start(MapleClient c, int npc, MapleCharacter chr) {
public boolean start(MapleClient c, int npc, Character chr) {
return start(c, npc, -1, chr);
}
public boolean start(MapleClient c, int npc, int oid, MapleCharacter chr) {
public boolean start(MapleClient c, int npc, int oid, Character chr) {
return start(c, npc, oid, null, chr);
}
public boolean start(MapleClient c, int npc, String fileName, MapleCharacter chr) {
public boolean start(MapleClient c, int npc, String fileName, Character chr) {
return start(c, npc, -1, fileName, chr);
}
public boolean start(MapleClient c, int npc, int oid, String fileName, MapleCharacter chr) {
public boolean start(MapleClient c, int npc, int oid, String fileName, Character chr) {
return start(c, npc, oid, fileName, chr, false, "cm");
}
public boolean start(MapleClient c, ScriptedItem scriptItem, MapleCharacter chr) {
public boolean start(MapleClient c, ScriptedItem scriptItem, Character chr) {
return start(c, scriptItem.getNpc(), -1, scriptItem.getScript(), chr, true, "im");
}
@@ -110,7 +110,7 @@ public class NPCScriptManager extends AbstractScriptManager {
}
}
private boolean start(MapleClient c, int npc, int oid, String fileName, MapleCharacter chr, boolean itemScript, String engineName) {
private boolean start(MapleClient c, int npc, int oid, String fileName, Character chr, boolean itemScript, String engineName) {
try {
final NPCConversationManager cm = new NPCConversationManager(c, npc, oid, fileName, itemScript);
if (cms.containsKey(c)) {