diff --git a/scripts/npc/1012100.js b/scripts/npc/1012100.js index 698ba0031f..6e0bee2384 100644 --- a/scripts/npc/1012100.js +++ b/scripts/npc/1012100.js @@ -94,9 +94,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/scripts/npc/1022000.js b/scripts/npc/1022000.js index 8e0ad6d308..00ba0352ee 100644 --- a/scripts/npc/1022000.js +++ b/scripts/npc/1022000.js @@ -95,9 +95,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/scripts/npc/1032001.js b/scripts/npc/1032001.js index 2aad6ef6b4..761e5884e1 100644 --- a/scripts/npc/1032001.js +++ b/scripts/npc/1032001.js @@ -95,9 +95,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/scripts/npc/1052001.js b/scripts/npc/1052001.js index 090f7ebc02..f70af17f2c 100644 --- a/scripts/npc/1052001.js +++ b/scripts/npc/1052001.js @@ -96,9 +96,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/scripts/npc/1090000.js b/scripts/npc/1090000.js index bb12416503..1bf421f35d 100644 --- a/scripts/npc/1090000.js +++ b/scripts/npc/1090000.js @@ -143,9 +143,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/scripts/npc/1102003.js b/scripts/npc/1102003.js index f1fe369d80..6877c2c906 100644 --- a/scripts/npc/1102003.js +++ b/scripts/npc/1102003.js @@ -65,9 +65,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/scripts/npc/1202010.js b/scripts/npc/1202010.js index f8d05c995c..7aa4b62473 100644 --- a/scripts/npc/1202010.js +++ b/scripts/npc/1202010.js @@ -37,9 +37,9 @@ function action(mode, type, selection) { return; } - const MaplePlayerNPC = Java.type('server.life.MaplePlayerNPC'); + const PlayerNPC = Java.type('server.life.PlayerNPC'); const GameConstants = Java.type('constants.game.GameConstants'); - if(MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { + if(PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(cm.getJob()), cm.getPlayer())) { cm.sendOk("There you go! Hope you will like it."); cm.gainMeso(-spawnPnpcFee); } else { diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index b66d970ac4..81f06c6566 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -63,10 +63,10 @@ import server.events.Events; import server.events.RescueGaga; import server.events.gm.Fitness; import server.events.gm.Ola; -import server.life.MaplePlayerNPC; import server.life.MobSkill; import server.life.MobSkillFactory; import server.life.Monster; +import server.life.PlayerNPC; import server.maps.*; import server.maps.MapleMiniGame.MiniGameResult; import server.minigame.MapleRockPaperScissor; @@ -6410,7 +6410,7 @@ public class Character extends AbstractCharacterObject { ThreadManager.getInstance().newTask(new Runnable() { @Override public void run() { - MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), Character.this); + PlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), Character.this); } }); } diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java index 4090eb2733..8a5476c3fd 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.MaplePlayerNPC; import server.life.Monster; import server.life.NPC; +import server.life.PlayerNPC; import server.maps.MapleMapObject; import java.util.HashSet; @@ -44,7 +44,7 @@ public class WhereaMiCommand extends Command { HashSet chars = new HashSet<>(); HashSet npcs = new HashSet<>(); - HashSet playernpcs = new HashSet<>(); + HashSet playernpcs = new HashSet<>(); HashSet mobs = new HashSet<>(); for (MapleMapObject mmo : player.getMap().getMapObjects()) { @@ -59,8 +59,8 @@ public class WhereaMiCommand extends Command { if (mob.isAlive()) { mobs.add(mob); } - } else if (mmo instanceof MaplePlayerNPC) { - MaplePlayerNPC npc = (MaplePlayerNPC) mmo; + } else if (mmo instanceof PlayerNPC) { + PlayerNPC npc = (PlayerNPC) mmo; playernpcs.add(npc); } } @@ -74,7 +74,7 @@ public class WhereaMiCommand extends Command { if (!playernpcs.isEmpty()) { player.yellowMessage("PlayerNPCs on this map:"); - for (MaplePlayerNPC pnpc : playernpcs) { + for (PlayerNPC pnpc : playernpcs) { player.dropMessage(5, ">> " + pnpc.getName() + " - Scriptid: " + pnpc.getScriptId() + " - Oid: " + pnpc.getObjectId()); } } diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java index 491baaad68..d4d5ae0316 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.Character; import client.Client; import client.command.Command; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; public class PlayerNpcCommand extends Command { { @@ -41,7 +41,7 @@ public class PlayerNpcCommand extends Command { return; } - if (!MaplePlayerNPC.spawnPlayerNPC(player.getMapId(), player.getPosition(), c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]))) { + if (!PlayerNPC.spawnPlayerNPC(player.getMapId(), player.getPosition(), c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]))) { player.dropMessage(5, "Could not deploy PlayerNPC. Either there's no room available here or depleted out scriptids to use."); } } diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java index 2493b24931..68616156ba 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.Character; import client.Client; import client.command.Command; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; public class PlayerNpcRemoveCommand extends Command { { @@ -40,6 +40,6 @@ public class PlayerNpcRemoveCommand extends Command { player.yellowMessage("Syntax: !playernpcremove "); return; } - MaplePlayerNPC.removePlayerNPC(c.getChannelServer().getPlayerStorage().getCharacterByName(params[0])); + PlayerNPC.removePlayerNPC(c.getChannelServer().getPlayerStorage().getCharacterByName(params[0])); } } diff --git a/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java b/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java index 6ee51ffd82..6f6394454c 100644 --- a/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java +++ b/src/main/java/client/command/commands/gm6/EraseAllPNpcsCommand.java @@ -25,7 +25,7 @@ package client.command.commands.gm6; import client.Client; import client.command.Command; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; public class EraseAllPNpcsCommand extends Command { { @@ -34,6 +34,6 @@ public class EraseAllPNpcsCommand extends Command { @Override public void execute(Client c, String[] params) { - MaplePlayerNPC.removeAllPlayerNPC(); + PlayerNPC.removeAllPlayerNPC(); } } diff --git a/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java b/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java index 077f4a2066..d3633ff07e 100644 --- a/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java +++ b/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm6; import client.Character; import client.Client; import client.command.Command; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; public class SpawnAllPNpcsCommand extends Command { { @@ -36,6 +36,6 @@ public class SpawnAllPNpcsCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - MaplePlayerNPC.multicastSpawnPlayerNPC(player.getMapId(), player.getWorld()); + PlayerNPC.multicastSpawnPlayerNPC(player.getMapId(), player.getWorld()); } } diff --git a/src/main/java/net/server/channel/handlers/NPCTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCTalkHandler.java index c207bb95b2..67d6869b63 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.MaplePlayerNPC; import server.life.NPC; +import server.life.PlayerNPC; import server.maps.MapleMapObject; import tools.FilePrinter; import tools.PacketCreator; @@ -82,8 +82,8 @@ public final class NPCTalkHandler extends AbstractPacketHandler { } } } - } else if (obj instanceof MaplePlayerNPC) { - MaplePlayerNPC pnpc = (MaplePlayerNPC) obj; + } else if (obj instanceof PlayerNPC) { + PlayerNPC pnpc = (PlayerNPC) obj; NPCScriptManager nsm = NPCScriptManager.getInstance(); if (pnpc.getScriptId() < 9977777 && !nsm.isNpcScriptAvailable(c, "" + pnpc.getScriptId())) { diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index 01f7bdb309..a684575e58 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -50,7 +50,7 @@ import server.expeditions.ExpeditionType; import server.gachapon.MapleGachapon; import server.gachapon.MapleGachapon.MapleGachaponItem; import server.life.LifeFactory; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; import server.maps.MapleMap; import server.maps.MapleMapManager; import server.maps.MapleMapObject; @@ -311,12 +311,12 @@ public class NPCConversationManager extends AbstractPlayerInteraction { public boolean canSpawnPlayerNpc(int mapid) { Character chr = getPlayer(); - return !YamlConfig.config.server.PLAYERNPC_AUTODEPLOY && chr.getLevel() >= chr.getMaxClassLevel() && !chr.isGM() && MaplePlayerNPC.canSpawnPlayerNpc(chr.getName(), mapid); + return !YamlConfig.config.server.PLAYERNPC_AUTODEPLOY && chr.getLevel() >= chr.getMaxClassLevel() && !chr.isGM() && PlayerNPC.canSpawnPlayerNpc(chr.getName(), mapid); } - public MaplePlayerNPC getPlayerNPCByScriptid(int scriptId) { + public PlayerNPC getPlayerNPCByScriptid(int scriptId) { for(MapleMapObject pnpcObj : getPlayer().getMap().getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC))) { - MaplePlayerNPC pn = (MaplePlayerNPC) pnpcObj; + PlayerNPC pn = (PlayerNPC) pnpcObj; if(pn.getScriptId() == scriptId) { return pn; diff --git a/src/main/java/server/life/MaplePlayerNPCFactory.java b/src/main/java/server/life/MaplePlayerNPCFactory.java index 42d2c419d6..e66c5735e0 100644 --- a/src/main/java/server/life/MaplePlayerNPCFactory.java +++ b/src/main/java/server/life/MaplePlayerNPCFactory.java @@ -39,7 +39,7 @@ public class MaplePlayerNPCFactory { private static DataProvider npcData = DataProviderFactory.getDataProvider(WZFiles.NPC); - private static final Map> dnpcMaps = new HashMap<>(); + private static final Map> dnpcMaps = new HashMap<>(); private static Integer runningDeveloperOid = 2147483000; // 647 slots, long enough public synchronized static boolean isExistentScriptid(int scriptid) { @@ -97,13 +97,13 @@ public class MaplePlayerNPCFactory { equips.put(equippos, equipid); } - List dnpcSet = dnpcMaps.get(mapid); + List dnpcSet = dnpcMaps.get(mapid); if(dnpcSet == null) { dnpcSet = new LinkedList<>(); dnpcMaps.put(mapid, dnpcSet); } - dnpcSet.add(new MaplePlayerNPC(name, scriptId, face, hair, gender, skin, equips, dir, FH, RX0, RX1, CX, CY, runningDeveloperOid)); + dnpcSet.add(new PlayerNPC(name, scriptId, face, hair, gender, skin, equips, dir, FH, RX0, RX1, CX, CY, runningDeveloperOid)); runningDeveloperOid++; } } else { @@ -123,19 +123,19 @@ public class MaplePlayerNPCFactory { equips.put((short) -7, 1072154); equips.put((short) -5, 1040103); - List dnpcSet = dnpcMaps.get(mapid); + List dnpcSet = dnpcMaps.get(mapid); if(dnpcSet == null) { dnpcSet = new LinkedList<>(); dnpcMaps.put(mapid, dnpcSet); } - dnpcSet.add(new MaplePlayerNPC(name, scriptId, face, hair, gender, (byte) skin, equips, dir, FH, RX0, RX1, CX, CY, runningDeveloperOid)); + dnpcSet.add(new PlayerNPC(name, scriptId, face, hair, gender, (byte) skin, equips, dir, FH, RX0, RX1, CX, CY, runningDeveloperOid)); runningDeveloperOid++; } } } - public synchronized static List getDeveloperNpcsFromMapid(int mapid) { + public synchronized static List getDeveloperNpcsFromMapid(int mapid) { return dnpcMaps.get(mapid); } } diff --git a/src/main/java/server/life/MaplePlayerNPC.java b/src/main/java/server/life/PlayerNPC.java similarity index 92% rename from src/main/java/server/life/MaplePlayerNPC.java rename to src/main/java/server/life/PlayerNPC.java index ae9976b53f..0cc5d24bce 100644 --- a/src/main/java/server/life/MaplePlayerNPC.java +++ b/src/main/java/server/life/PlayerNPC.java @@ -47,11 +47,10 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; /** - * * @author XoticStory * @author Ronan */ -public class MaplePlayerNPC extends AbstractMapleMapObject { +public class PlayerNPC extends AbstractMapleMapObject { private static final Map> availablePlayerNpcScriptIds = new HashMap<>(); private static final AtomicInteger runningOverallRank = new AtomicInteger(); private static final List runningWorldRank = new ArrayList<>(); @@ -68,7 +67,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { getRunningMetadata(); } - public MaplePlayerNPC(String name, int scriptId, int face, int hair, int gender, byte skin, Map equips, int dir, int FH, int RX0, int RX1, int CX, int CY, int oid) { + public PlayerNPC(String name, int scriptId, int face, int hair, int gender, byte skin, Map equips, int dir, int FH, int RX0, int RX1, int CX, int CY, int oid) { this.equips = equips; this.scriptId = scriptId; this.face = face; @@ -87,7 +86,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { setObjectId(oid); } - public MaplePlayerNPC(ResultSet rs) { + public PlayerNPC(ResultSet rs) { try { CY = rs.getInt("cy"); name = rs.getString("name"); @@ -261,7 +260,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { private static int getAndIncrementRunningWorldJobRanks(int world, int job) { AtomicInteger wjr = runningWorldJobRank.get(new Pair<>(world, job)); - if(wjr == null) { + if (wjr == null) { wjr = new AtomicInteger(1); runningWorldJobRank.put(new Pair<>(world, job), wjr); } @@ -357,15 +356,15 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { private static int getNextScriptId(byte branch) { List availablesBranch = availablePlayerNpcScriptIds.get(branch); - if(availablesBranch == null) { + if (availablesBranch == null) { availablesBranch = new ArrayList<>(20); availablePlayerNpcScriptIds.put(branch, availablesBranch); } - if(availablesBranch.isEmpty()) { + if (availablesBranch.isEmpty()) { fetchAvailableScriptIdsFromDb(branch, availablesBranch); - if(availablesBranch.isEmpty()) { + if (availablesBranch.isEmpty()) { return -1; } } @@ -373,7 +372,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { return availablesBranch.remove(availablesBranch.size() - 1); } - private static MaplePlayerNPC createPlayerNPCInternal(MapleMap map, Point pos, Character chr) { + private static PlayerNPC createPlayerNPCInternal(MapleMap map, Point pos, Character chr) { int mapId = map.getId(); if (!canSpawnPlayerNpc(chr.getName(), mapId)) { @@ -406,7 +405,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { int worldId = chr.getWorld(); int jobId = (chr.getJob().getId() / 100) * 100; - MaplePlayerNPC ret; + PlayerNPC ret; try (Connection con = DatabaseConnection.getConnection()) { boolean createNew = false; try (PreparedStatement ps = con.prepareStatement("SELECT * FROM playernpcs WHERE scriptid = ?")) { @@ -467,7 +466,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { try (ResultSet rs = ps.executeQuery()) { rs.next(); - ret = new MaplePlayerNPC(rs); + ret = new PlayerNPC(rs); } } } else { @@ -519,8 +518,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { return mapids; } - private static synchronized Pair> processPlayerNPCInternal(MapleMap map, Point pos, Character chr, boolean create) { - if(create) { + private static synchronized Pair> processPlayerNPCInternal(MapleMap map, Point pos, Character chr, boolean create) { + if (create) { return new Pair<>(createPlayerNPCInternal(map, pos, chr), null); } else { return new Pair<>(null, removePlayerNPCInternal(map, chr)); @@ -532,10 +531,12 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { } public static boolean spawnPlayerNPC(int mapid, Point pos, Character chr) { - if(chr == null) return false; + if (chr == null) { + return false; + } - MaplePlayerNPC pn = processPlayerNPCInternal(chr.getClient().getChannelServer().getMapFactory().getMap(mapid), pos, chr, true).getLeft(); - if(pn != null) { + PlayerNPC pn = processPlayerNPCInternal(chr.getClient().getChannelServer().getMapFactory().getMap(mapid), pos, chr, true).getLeft(); + if (pn != null) { for (Channel channel : Server.getInstance().getChannelsFromWorld(chr.getWorld())) { MapleMap m = channel.getMapFactory().getMap(mapid); @@ -550,12 +551,12 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { } } - private static MaplePlayerNPC getPlayerNPCFromWorldMap(String name, int world, int map) { + private static PlayerNPC getPlayerNPCFromWorldMap(String name, int world, int map) { World wserv = Server.getInstance().getWorld(world); - for(MapleMapObject pnpcObj : wserv.getChannel(1).getMapFactory().getMap(map).getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC))) { - MaplePlayerNPC pn = (MaplePlayerNPC) pnpcObj; + for (MapleMapObject pnpcObj : wserv.getChannel(1).getMapFactory().getMap(map).getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC))) { + PlayerNPC pn = (PlayerNPC) pnpcObj; - if(name.contentEquals(pn.getName()) && pn.getScriptId() < 9977777) { + if (name.contentEquals(pn.getName()) && pn.getScriptId() < 9977777) { return pn; } } @@ -564,15 +565,17 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { } public static void removePlayerNPC(Character chr) { - if(chr == null) return; + if (chr == null) { + return; + } List updateMapids = processPlayerNPCInternal(null, null, chr, false).getRight(); int worldid = updateMapids.remove(0); for (Integer mapid : updateMapids) { - MaplePlayerNPC pn = getPlayerNPCFromWorldMap(chr.getName(), worldid, mapid); + PlayerNPC pn = getPlayerNPCFromWorldMap(chr.getName(), worldid, mapid); - if(pn != null) { + if (pn != null) { for (Channel channel : Server.getInstance().getChannelsFromWorld(worldid)) { MapleMap m = channel.getMapFactory().getMap(mapid); m.removeMapObject(pn); @@ -586,13 +589,15 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { public static void multicastSpawnPlayerNPC(int mapid, int world) { World wserv = Server.getInstance().getWorld(world); - if (wserv == null) return; + if (wserv == null) { + return; + } Client c = Client.createMock(); c.setWorld(world); c.setChannel(1); - for(Character mc : wserv.loadAndGetAllCharactersView()) { + for (Character mc : wserv.loadAndGetAllCharactersView()) { mc.setClient(c); spawnPlayerNPC(mapid, mc); } @@ -613,7 +618,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { MapleMap m = channel.getMapFactory().getMap(map); for (MapleMapObject pnpcObj : m.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC))) { - MaplePlayerNPC pn = (MaplePlayerNPC) pnpcObj; + PlayerNPC pn = (PlayerNPC) pnpcObj; m.removeMapObject(pnpcObj); m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); diff --git a/src/main/java/server/life/positioner/PlayerNPCPodium.java b/src/main/java/server/life/positioner/PlayerNPCPodium.java index ba53741d98..17793bd083 100644 --- a/src/main/java/server/life/positioner/PlayerNPCPodium.java +++ b/src/main/java/server/life/positioner/PlayerNPCPodium.java @@ -22,7 +22,7 @@ package server.life.positioner; import config.YamlConfig; import net.server.Server; import net.server.channel.Channel; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; @@ -63,9 +63,9 @@ public class PlayerNPCPodium { return pos; } - private static Point rearrangePlayerNpcs(MapleMap map, int newStep, List pnpcs) { + private static Point rearrangePlayerNpcs(MapleMap map, int newStep, List pnpcs) { int i = 0; - for (MaplePlayerNPC pn : pnpcs) { + for (PlayerNPC pn : pnpcs) { pn.updatePlayerNPCPosition(map, calcNextPos(i, newStep)); i++; } @@ -79,9 +79,9 @@ public class PlayerNPCPodium { System.out.println("Reorganizing pnpc map, step " + newStep); } - List playerNpcs = new ArrayList<>(mmoList.size()); + List playerNpcs = new ArrayList<>(mmoList.size()); for (MapleMapObject mmo : mmoList) { - playerNpcs.add((MaplePlayerNPC) mmo); + playerNpcs.add((PlayerNPC) mmo); } playerNpcs.sort((p1, p2) -> { @@ -91,7 +91,7 @@ public class PlayerNPCPodium { for (Channel ch : Server.getInstance().getChannelsFromWorld(map.getWorld())) { MapleMap m = ch.getMapFactory().getMap(map.getId()); - for (MaplePlayerNPC pn : playerNpcs) { + for (PlayerNPC pn : playerNpcs) { m.removeMapObject(pn); m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); @@ -103,7 +103,7 @@ public class PlayerNPCPodium { for (Channel ch : Server.getInstance().getChannelsFromWorld(map.getWorld())) { MapleMap m = ch.getMapFactory().getMap(map.getId()); - for (MaplePlayerNPC pn : playerNpcs) { + for (PlayerNPC pn : playerNpcs) { m.addPlayerNPCMapObject(pn); m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn)); m.broadcastMessage(PacketCreator.getPlayerNPC(pn)); diff --git a/src/main/java/server/life/positioner/PlayerNPCPositioner.java b/src/main/java/server/life/positioner/PlayerNPCPositioner.java index b39986ce2e..2cb9155df8 100644 --- a/src/main/java/server/life/positioner/PlayerNPCPositioner.java +++ b/src/main/java/server/life/positioner/PlayerNPCPositioner.java @@ -22,7 +22,7 @@ package server.life.positioner; import config.YamlConfig; import net.server.Server; import net.server.channel.Channel; -import server.life.MaplePlayerNPC; +import server.life.PlayerNPC; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; @@ -94,7 +94,7 @@ public class PlayerNPCPositioner { return null; } - private static Point rearrangePlayerNpcs(MapleMap map, int newStep, List pnpcs) { + private static Point rearrangePlayerNpcs(MapleMap map, int newStep, List pnpcs) { Rectangle mapArea = map.getMapArea(); int leftPx = mapArea.x + YamlConfig.config.server.PLAYERNPC_INITIAL_X, px, py = mapArea.y + YamlConfig.config.server.PLAYERNPC_INITIAL_Y; @@ -115,7 +115,7 @@ public class PlayerNPCPositioner { return searchPos; } - MaplePlayerNPC pn = pnpcs.get(i); + PlayerNPC pn = pnpcs.get(i); i++; pn.updatePlayerNPCPosition(map, searchPos); @@ -138,9 +138,9 @@ public class PlayerNPCPositioner { System.out.println("Reorganizing pnpc map, step " + newStep); } - List playerNpcs = new ArrayList<>(mmoList.size()); + List playerNpcs = new ArrayList<>(mmoList.size()); for (MapleMapObject mmo : mmoList) { - playerNpcs.add((MaplePlayerNPC) mmo); + playerNpcs.add((PlayerNPC) mmo); } playerNpcs.sort((p1, p2) -> { @@ -150,7 +150,7 @@ public class PlayerNPCPositioner { for (Channel ch : Server.getInstance().getChannelsFromWorld(map.getWorld())) { MapleMap m = ch.getMapFactory().getMap(map.getId()); - for (MaplePlayerNPC pn : playerNpcs) { + for (PlayerNPC pn : playerNpcs) { m.removeMapObject(pn); m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId())); m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId())); @@ -162,7 +162,7 @@ public class PlayerNPCPositioner { for (Channel ch : Server.getInstance().getChannelsFromWorld(map.getWorld())) { MapleMap m = ch.getMapFactory().getMap(map.getId()); - for (MaplePlayerNPC pn : playerNpcs) { + for (PlayerNPC pn : playerNpcs) { m.addPlayerNPCMapObject(pn); m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn)); m.broadcastMessage(PacketCreator.getPlayerNPC(pn)); diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index de9044792e..201acc5dab 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -352,7 +352,7 @@ public class MapleMap { return -1; } - public void addPlayerNPCMapObject(MaplePlayerNPC pnpcobject) { + public void addPlayerNPCMapObject(PlayerNPC pnpcobject) { objectWLock.lock(); try { this.mapobjects.put(pnpcobject.getObjectId(), pnpcobject); diff --git a/src/main/java/server/maps/MapleMapFactory.java b/src/main/java/server/maps/MapleMapFactory.java index a895875133..b33edfe3cf 100644 --- a/src/main/java/server/maps/MapleMapFactory.java +++ b/src/main/java/server/maps/MapleMapFactory.java @@ -242,16 +242,16 @@ public class MapleMapFactory { try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { - map.addPlayerNPCMapObject(new MaplePlayerNPC(rs)); + map.addPlayerNPCMapObject(new PlayerNPC(rs)); } } } catch (SQLException e) { e.printStackTrace(); } - List dnpcs = MaplePlayerNPCFactory.getDeveloperNpcsFromMapid(mapid); + List dnpcs = MaplePlayerNPCFactory.getDeveloperNpcsFromMapid(mapid); if (dnpcs != null) { - for (MaplePlayerNPC dnpc : dnpcs) { + for (PlayerNPC dnpc : dnpcs) { map.addPlayerNPCMapObject(dnpc); } } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 1b2b7a12e5..ed5d04c1af 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.MaplePlayerNPC; import server.life.MobSkill; import server.life.Monster; import server.life.NPC; +import server.life.PlayerNPC; import server.maps.*; import server.maps.MapleMiniGame.MiniGameResult; import server.movement.LifeMovementFragment; @@ -5234,7 +5234,7 @@ public class PacketCreator { return p; } - public static Packet spawnPlayerNPC(MaplePlayerNPC npc) { + public static Packet spawnPlayerNPC(PlayerNPC npc) { final OutPacket p = OutPacket.create(SendOpcode.SPAWN_NPC_REQUEST_CONTROLLER); p.writeByte(1); p.writeInt(npc.getObjectId()); @@ -5249,7 +5249,7 @@ public class PacketCreator { return p; } - public static Packet getPlayerNPC(MaplePlayerNPC npc) { // thanks to Arnah + public static Packet getPlayerNPC(PlayerNPC npc) { // thanks to Arnah final OutPacket p = OutPacket.create(SendOpcode.IMITATED_NPC_DATA); p.writeByte(0x01); p.writeInt(npc.getScriptId());