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

Rename and clean up MapleNPC

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:09:31 +02:00
parent 3aa455a757
commit e48c25a200
11 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/channel/handlers/NPCTalkHandler.java
View File

@@ -27,8 +27,8 @@ import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import scripting.npc.NPCScriptManager;
import server.life.MapleNPC;
import server.life.MaplePlayerNPC;
import server.life.NPC;
import server.maps.MapleMapObject;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -48,8 +48,8 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
int oid = p.readInt();
MapleMapObject obj = c.getPlayer().getMap().getMapObject(oid);
if (obj instanceof MapleNPC) {
MapleNPC npc = (MapleNPC) obj;
if (obj instanceof NPC) {
NPC npc = (NPC) obj;
if(YamlConfig.config.server.USE_DEBUG == true) c.getPlayer().dropMessage(5, "Talking to NPC " + npc.getId());
if (npc.getId() == 9010009) { //is duey

4
src/main/java/net/server/channel/handlers/QuestActionHandler.java
View File

@@ -26,7 +26,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import scripting.quest.QuestScriptManager;
import server.life.MapleNPC;
import server.life.NPC;
import server.quest.MapleQuest;
import java.awt.*;
@@ -52,7 +52,7 @@ public final class QuestActionHandler extends AbstractPacketHandler {
}
if (!quest.isAutoStart() && !quest.isAutoComplete()) {
MapleNPC npc = player.getMap().getNPCById(npcId);
NPC npc = player.getMap().getNPCById(npcId);
if(npc == null) {
return false;
}