From cd90ec107a028b63f6eb3d5f6b0e1c16775c9591 Mon Sep 17 00:00:00 2001 From: Joe0 Date: Wed, 14 Mar 2012 13:55:33 -0500 Subject: [PATCH] Changed OtherNPC to OtherNpc, which conforms to the convention used elsewhere. --- .../msc/gs/npchandler/{OtherNPC.java => OtherNpc.java} | 2 +- .../org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename GameServer/src/org/moparscape/msc/gs/npchandler/{OtherNPC.java => OtherNpc.java} (92%) diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java b/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNpc.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/OtherNpc.java index 32eecd1..b4d0606 100644 --- a/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNpc.java @@ -12,7 +12,7 @@ import org.moparscape.msc.gs.model.World; * @author xEnt * */ -public class OtherNPC implements NpcHandler { +public class OtherNpc implements NpcHandler { public static final World world = Instance.getWorld(); diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java index 6efe6ad..e57cd39 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java @@ -148,7 +148,7 @@ public class TalkToNpcHandler implements PacketHandler { owner.getInterpreterThread().start(); } else { try { - NpcHandler hand = new org.moparscape.msc.gs.npchandler.OtherNPC(); + NpcHandler hand = new org.moparscape.msc.gs.npchandler.OtherNpc(); hand.handleNpc(affectedNpc, owner); } catch (Exception e) { Logger.error("Exception with npc["