From 2ee4cd79f600cd861d37906e2957051236f640c4 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:10:20 +0200 Subject: [PATCH] Rename and clean up MapleNPCStats --- src/main/java/server/life/LifeFactory.java | 2 +- src/main/java/server/life/NPC.java | 4 ++-- .../java/server/life/{MapleNPCStats.java => NPCStats.java} | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) rename src/main/java/server/life/{MapleNPCStats.java => NPCStats.java} (94%) diff --git a/src/main/java/server/life/LifeFactory.java b/src/main/java/server/life/LifeFactory.java index 5e7c6e8ad5..b088bf05e6 100644 --- a/src/main/java/server/life/LifeFactory.java +++ b/src/main/java/server/life/LifeFactory.java @@ -285,7 +285,7 @@ public class LifeFactory { } public static NPC getNPC(int nid) { - return new NPC(nid, new MapleNPCStats(DataTool.getString(nid + "/name", npcStringData, "MISSINGNO"))); + return new NPC(nid, new NPCStats(DataTool.getString(nid + "/name", npcStringData, "MISSINGNO"))); } public static String getNPCDefaultTalk(int nid) { diff --git a/src/main/java/server/life/NPC.java b/src/main/java/server/life/NPC.java index e0c3447b48..3a999bcddc 100644 --- a/src/main/java/server/life/NPC.java +++ b/src/main/java/server/life/NPC.java @@ -27,9 +27,9 @@ import server.maps.MapleMapObjectType; import tools.PacketCreator; public class NPC extends AbstractLoadedLife { - private final MapleNPCStats stats; + private final NPCStats stats; - public NPC(int id, MapleNPCStats stats) { + public NPC(int id, NPCStats stats) { super(id); this.stats = stats; } diff --git a/src/main/java/server/life/MapleNPCStats.java b/src/main/java/server/life/NPCStats.java similarity index 94% rename from src/main/java/server/life/MapleNPCStats.java rename to src/main/java/server/life/NPCStats.java index 1b225dde5c..5d3b943947 100644 --- a/src/main/java/server/life/MapleNPCStats.java +++ b/src/main/java/server/life/NPCStats.java @@ -22,13 +22,12 @@ package server.life; /** - * * @author Matze */ -public class MapleNPCStats { +public class NPCStats { private String name; - public MapleNPCStats(String name) { + public NPCStats(String name) { this.name = name; }