From 1f349d1dae912c126a365e40baa429891c802ca4 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Thu, 9 Sep 2021 22:03:38 +0200
Subject: [PATCH] Rename and clean up AbstractLoadedMapleLife

---
 ...AbstractLoadedMapleLife.java => AbstractLoadedLife.java} | 6 +++---
 src/main/java/server/life/MapleLifeFactory.java             | 2 +-
 src/main/java/server/life/MapleMonster.java                 | 2 +-
 src/main/java/server/life/MapleNPC.java                     | 2 +-
 src/main/java/server/maps/MapleMapFactory.java              | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/server/life/{AbstractLoadedMapleLife.java => AbstractLoadedLife.java} (92%)

diff --git a/src/main/java/server/life/AbstractLoadedMapleLife.java b/src/main/java/server/life/AbstractLoadedLife.java
similarity index 92%
rename from src/main/java/server/life/AbstractLoadedMapleLife.java
rename to src/main/java/server/life/AbstractLoadedLife.java
index d0964f9bc0..670f532d2a 100644
--- a/src/main/java/server/life/AbstractLoadedMapleLife.java
+++ b/src/main/java/server/life/AbstractLoadedLife.java
@@ -23,7 +23,7 @@ package server.life;
 
 import server.maps.AbstractAnimatedMapleMapObject;
 
-public abstract class AbstractLoadedMapleLife extends AbstractAnimatedMapleMapObject {
+public abstract class AbstractLoadedLife extends AbstractAnimatedMapleMapObject {
     private final int id;
     private int f;
     private boolean hide;
@@ -33,11 +33,11 @@ public abstract class AbstractLoadedMapleLife extends AbstractAnimatedMapleMapOb
     private int rx0;
     private int rx1;
 
-    public AbstractLoadedMapleLife(int id) {
+    public AbstractLoadedLife(int id) {
         this.id = id;
     }
 
-    public AbstractLoadedMapleLife(AbstractLoadedMapleLife life) {
+    public AbstractLoadedLife(AbstractLoadedLife life) {
         this(life.getId());
         this.f = life.f;
         this.hide = life.hide;
diff --git a/src/main/java/server/life/MapleLifeFactory.java b/src/main/java/server/life/MapleLifeFactory.java
index 061ae138de..cb510eefc4 100644
--- a/src/main/java/server/life/MapleLifeFactory.java
+++ b/src/main/java/server/life/MapleLifeFactory.java
@@ -54,7 +54,7 @@ public class MapleLifeFactory {
         return ret;
     }
     
-    public static AbstractLoadedMapleLife getLife(int id, String type) {
+    public static AbstractLoadedLife getLife(int id, String type) {
         if (type.equalsIgnoreCase("n")) {
             return getNPC(id);
         } else if (type.equalsIgnoreCase("m")) {
diff --git a/src/main/java/server/life/MapleMonster.java b/src/main/java/server/life/MapleMonster.java
index 821d2d74c4..8afa91a49e 100644
--- a/src/main/java/server/life/MapleMonster.java
+++ b/src/main/java/server/life/MapleMonster.java
@@ -64,7 +64,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-public class MapleMonster extends AbstractLoadedMapleLife {
+public class MapleMonster extends AbstractLoadedLife {
     
     private ChangeableStats ostats = null;  //unused, v83 WZs offers no support for changeable stats.
     private MapleMonsterStats stats;
diff --git a/src/main/java/server/life/MapleNPC.java b/src/main/java/server/life/MapleNPC.java
index c2dd0d87ec..33eed4a74f 100644
--- a/src/main/java/server/life/MapleNPC.java
+++ b/src/main/java/server/life/MapleNPC.java
@@ -26,7 +26,7 @@ import server.MapleShopFactory;
 import server.maps.MapleMapObjectType;
 import tools.PacketCreator;
 
-public class MapleNPC extends AbstractLoadedMapleLife {
+public class MapleNPC extends AbstractLoadedLife {
     private final MapleNPCStats stats;
 
     public MapleNPC(int id, MapleNPCStats stats) {
diff --git a/src/main/java/server/maps/MapleMapFactory.java b/src/main/java/server/maps/MapleMapFactory.java
index 1a9fb1bb29..7586ea63e2 100644
--- a/src/main/java/server/maps/MapleMapFactory.java
+++ b/src/main/java/server/maps/MapleMapFactory.java
@@ -109,7 +109,7 @@ public class MapleMapFactory {
     }
 
     private static void loadLifeRaw(MapleMap map, int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide, int mobTime, int team) {
-        AbstractLoadedMapleLife myLife = loadLife(id, type, cy, f, fh, rx0, rx1, x, y, hide);
+        AbstractLoadedLife myLife = loadLife(id, type, cy, f, fh, rx0, rx1, x, y, hide);
         if (myLife instanceof MapleMonster) {
             MapleMonster monster = (MapleMonster) myLife;
 
@@ -338,8 +338,8 @@ public class MapleMapFactory {
         return map;
     }
     
-    private static AbstractLoadedMapleLife loadLife(int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide) {
-        AbstractLoadedMapleLife myLife = MapleLifeFactory.getLife(id, type);
+    private static AbstractLoadedLife loadLife(int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide) {
+        AbstractLoadedLife myLife = MapleLifeFactory.getLife(id, type);
         myLife.setCy(cy);
         myLife.setF(f);
         myLife.setFh(fh);