diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java index ccf084d531..4090eb2733 100644 --- a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java +++ b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java @@ -26,9 +26,9 @@ package client.command.commands.gm2; import client.Character; import client.Client; import client.command.Command; -import server.life.MapleNPC; import server.life.MaplePlayerNPC; import server.life.Monster; +import server.life.NPC; import server.maps.MapleMapObject; import java.util.HashSet; @@ -43,13 +43,13 @@ public class WhereaMiCommand extends Command { Character player = c.getPlayer(); HashSet chars = new HashSet<>(); - HashSet npcs = new HashSet<>(); + HashSet npcs = new HashSet<>(); HashSet playernpcs = new HashSet<>(); HashSet mobs = new HashSet<>(); for (MapleMapObject mmo : player.getMap().getMapObjects()) { - if (mmo instanceof MapleNPC) { - MapleNPC npc = (MapleNPC) mmo; + if (mmo instanceof NPC) { + NPC npc = (NPC) mmo; npcs.add(npc); } else if (mmo instanceof Character) { Character mc = (Character) mmo; @@ -81,7 +81,7 @@ public class WhereaMiCommand extends Command { if (!npcs.isEmpty()) { player.yellowMessage("NPCs on this map:"); - for (MapleNPC npc : npcs) { + for (NPC npc : npcs) { player.dropMessage(5, ">> " + npc.getName() + " - " + npc.getId() + " - Oid: " + npc.getObjectId()); } } diff --git a/src/main/java/client/command/commands/gm3/NpcCommand.java b/src/main/java/client/command/commands/gm3/NpcCommand.java index 192b08a55b..9fe52f77bf 100644 --- a/src/main/java/client/command/commands/gm3/NpcCommand.java +++ b/src/main/java/client/command/commands/gm3/NpcCommand.java @@ -27,7 +27,7 @@ import client.Character; import client.Client; import client.command.Command; import server.life.LifeFactory; -import server.life.MapleNPC; +import server.life.NPC; import tools.PacketCreator; public class NpcCommand extends Command { @@ -42,7 +42,7 @@ public class NpcCommand extends Command { player.yellowMessage("Syntax: !npc "); return; } - MapleNPC npc = LifeFactory.getNPC(Integer.parseInt(params[0])); + NPC npc = LifeFactory.getNPC(Integer.parseInt(params[0])); if (npc != null) { npc.setPosition(player.getPosition()); npc.setCy(player.getPosition().y); diff --git a/src/main/java/client/command/commands/gm4/PnpcCommand.java b/src/main/java/client/command/commands/gm4/PnpcCommand.java index 8d89737811..e6212b27c4 100644 --- a/src/main/java/client/command/commands/gm4/PnpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcCommand.java @@ -28,7 +28,7 @@ import client.Client; import client.command.Command; import net.server.channel.Channel; import server.life.LifeFactory; -import server.life.MapleNPC; +import server.life.NPC; import server.maps.MapleMap; import tools.DatabaseConnection; import tools.PacketCreator; @@ -59,7 +59,7 @@ public class PnpcCommand extends Command { return; } - MapleNPC npc = LifeFactory.getNPC(npcId); + NPC npc = LifeFactory.getNPC(npcId); Point checkpos = player.getMap().getGroundBelow(player.getPosition()); int xpos = checkpos.x; diff --git a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java index 83f819a49e..c207bb95b2 100644 --- a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java +++ b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java @@ -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 diff --git a/src/main/java/net/server/channel/handlers/QuestActionHandler.java b/src/main/java/net/server/channel/handlers/QuestActionHandler.java index 12344f3fb8..ebed7d57be 100644 --- a/src/main/java/net/server/channel/handlers/QuestActionHandler.java +++ b/src/main/java/net/server/channel/handlers/QuestActionHandler.java @@ -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; } diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index c3943883df..8c730d8521 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -948,7 +948,7 @@ public class AbstractPlayerInteraction { } public void spawnNpc(int npcId, Point pos, MapleMap map) { - MapleNPC npc = LifeFactory.getNPC(npcId); + NPC npc = LifeFactory.getNPC(npcId); if (npc != null) { npc.setPosition(pos); npc.setCy(pos.y); diff --git a/src/main/java/scripting/event/EventInstanceManager.java b/src/main/java/scripting/event/EventInstanceManager.java index 33c083516e..e81e4e9267 100644 --- a/src/main/java/scripting/event/EventInstanceManager.java +++ b/src/main/java/scripting/event/EventInstanceManager.java @@ -42,8 +42,8 @@ import server.ThreadManager; import server.TimerManager; import server.expeditions.Expedition; import server.life.LifeFactory; -import server.life.MapleNPC; import server.life.Monster; +import server.life.NPC; import server.maps.MapleMap; import server.maps.MapleMapManager; import server.maps.MaplePortal; @@ -849,7 +849,7 @@ public class EventInstanceManager { } public void spawnNpc(int npcId, Point pos, MapleMap map) { - MapleNPC npc = LifeFactory.getNPC(npcId); + NPC npc = LifeFactory.getNPC(npcId); if (npc != null) { npc.setPosition(pos); npc.setCy(pos.y); diff --git a/src/main/java/server/life/LifeFactory.java b/src/main/java/server/life/LifeFactory.java index 0fb44abbb9..5e7c6e8ad5 100644 --- a/src/main/java/server/life/LifeFactory.java +++ b/src/main/java/server/life/LifeFactory.java @@ -284,8 +284,8 @@ public class LifeFactory { } } - public static MapleNPC getNPC(int nid) { - return new MapleNPC(nid, new MapleNPCStats(DataTool.getString(nid + "/name", npcStringData, "MISSINGNO"))); + public static NPC getNPC(int nid) { + return new NPC(nid, new MapleNPCStats(DataTool.getString(nid + "/name", npcStringData, "MISSINGNO"))); } public static String getNPCDefaultTalk(int nid) { diff --git a/src/main/java/server/life/MapleNPC.java b/src/main/java/server/life/NPC.java similarity index 95% rename from src/main/java/server/life/MapleNPC.java rename to src/main/java/server/life/NPC.java index 33eed4a74f..e0c3447b48 100644 --- a/src/main/java/server/life/MapleNPC.java +++ b/src/main/java/server/life/NPC.java @@ -26,10 +26,10 @@ import server.MapleShopFactory; import server.maps.MapleMapObjectType; import tools.PacketCreator; -public class MapleNPC extends AbstractLoadedLife { +public class NPC extends AbstractLoadedLife { private final MapleNPCStats stats; - public MapleNPC(int id, MapleNPCStats stats) { + public NPC(int id, MapleNPCStats stats) { super(id); this.stats = stats; } diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index 9dbe209b06..de9044792e 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -1684,10 +1684,10 @@ public class MapleMap { } } - public MapleNPC getNPCById(int id) { + public NPC getNPCById(int id) { for (MapleMapObject obj : getMapObjects()) { if (obj.getType() == MapleMapObjectType.NPC) { - MapleNPC npc = (MapleNPC) obj; + NPC npc = (NPC) obj; if (npc.getId() == id) { return npc; } @@ -1702,7 +1702,7 @@ public class MapleMap { try { for (MapleMapObject obj : mapobjects.values()) { if (obj.getType() == MapleMapObjectType.NPC) { - if (((MapleNPC) obj).getId() == npcid) { + if (((NPC) obj).getId() == npcid) { return true; } } @@ -1720,7 +1720,7 @@ public class MapleMap { objectWLock.lock(); try { for (MapleMapObject obj : npcs) { - if (((MapleNPC) obj).getId() == npcid) { + if (((NPC) obj).getId() == npcid) { broadcastMessage(PacketCreator.removeNPCController(obj.getObjectId())); broadcastMessage(PacketCreator.removeNPC(obj.getObjectId())); @@ -3965,7 +3965,7 @@ public class MapleMap { try { for (MapleMapObject obj : mapobjects.values()) { if (obj.getType() == MapleMapObjectType.NPC) { - MapleNPC npc = (MapleNPC) obj; + NPC npc = (NPC) obj; if (npc.getId() == id) { npc.setHide(!npc.isHidden()); if (!npc.isHidden()) //Should only be hidden upon changing maps diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 0e5458d4ee..1b2b7a12e5 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -61,10 +61,10 @@ import server.CashShop.CashItemFactory; import server.CashShop.SpecialCashItem; import server.*; import server.events.gm.Snowball; -import server.life.MapleNPC; import server.life.MaplePlayerNPC; import server.life.MobSkill; import server.life.Monster; +import server.life.NPC; import server.maps.*; import server.maps.MapleMiniGame.MiniGameResult; import server.movement.LifeMovementFragment; @@ -1291,7 +1291,7 @@ public class PacketCreator { return p; } - public static Packet spawnNPC(MapleNPC life) { + public static Packet spawnNPC(NPC life) { OutPacket p = OutPacket.create(SendOpcode.SPAWN_NPC); p.writeInt(life.getObjectId()); p.writeInt(life.getId()); @@ -1305,7 +1305,7 @@ public class PacketCreator { return p; } - public static Packet spawnNPCRequestController(MapleNPC life, boolean miniMap) { + public static Packet spawnNPCRequestController(NPC life, boolean miniMap) { OutPacket p = OutPacket.create(SendOpcode.SPAWN_NPC_REQUEST_CONTROLLER); p.writeByte(1); p.writeInt(life.getObjectId());