Rename and clean up MapleExpeditionType

src/main/java/server/expeditions/Expedition.java

@@ -81,7 +81,7 @@ public class Expedition {
     };
 
     private final Character leader;
-    private final MapleExpeditionType type;
+    private final ExpeditionType type;
     private boolean registering;
     private final MapleMap startMap;
     private final List<String> bossLogs;
@@ -95,7 +95,7 @@ public class Expedition {
     private final int maxSize;
     private final MonitoredReentrantLock pL = MonitoredReentrantLockFactory.createLock(MonitoredLockType.EIM_PARTY, true);
 
-    public Expedition(Character player, MapleExpeditionType met, boolean sil, int minPlayers, int maxPlayers) {
+    public Expedition(Character player, ExpeditionType met, boolean sil, int minPlayers, int maxPlayers) {
         leader = player;
         members.put(player.getId(), player.getName());
         startMap = player.getMap();
@@ -252,7 +252,7 @@ public class Expedition {
                 if (!silent) {
                     player.dropMessage(6, "[Expedition] You have been banned from this expedition.");
                 }
-                if (MapleExpeditionType.ARIANT.equals(type) || MapleExpeditionType.ARIANT1.equals(type) || MapleExpeditionType.ARIANT2.equals(type)) {
+                if (ExpeditionType.ARIANT.equals(type) || ExpeditionType.ARIANT1.equals(type) || ExpeditionType.ARIANT2.equals(type)) {
                     player.changeMap(980010000);
                 }
             }
@@ -287,7 +287,7 @@ public class Expedition {
         }
     }
 
-    public MapleExpeditionType getType() {
+    public ExpeditionType getType() {
         return type;
     }
 

src/main/java/server/expeditions/ExpeditionType.java

@@ -25,12 +25,10 @@ package server.expeditions;
 import config.YamlConfig;
 
 /**
-*
-* @author Alan (SharpAceX)
-*/
-
-public enum MapleExpeditionType {
+ * @author Alan (SharpAceX)
+ */
 
+public enum ExpeditionType {
     BALROG_EASY(3, 30, 50, 255, 5),
     BALROG_NORMAL(6, 30, 50, 255, 5),
     SCARGA(6, 30, 100, 255, 5),
@@ -44,14 +42,14 @@ public enum MapleExpeditionType {
     ARIANT2(2, 7, 20, 30, 5),
     PINKBEAN(6, 30, 120, 255, 5),
     CWKPQ(6, 30, 90, 255, 5);   // CWKPQ min-level 90, found thanks to Cato
-    
-    private int minSize;
-    private int maxSize;
-    private int minLevel;
-    private int maxLevel;
-    private int registrationTime;
-        
-    private MapleExpeditionType(int minSize, int maxSize, int minLevel, int maxLevel, int minutes) {
+
+    private final int minSize;
+    private final int maxSize;
+    private final int minLevel;
+    private final int maxLevel;
+    private final int registrationTime;
+
+    ExpeditionType(int minSize, int maxSize, int minLevel, int maxLevel, int minutes) {
         this.minSize = minSize;
         this.maxSize = maxSize;
         this.minLevel = minLevel;
@@ -60,22 +58,22 @@ public enum MapleExpeditionType {
     }
 
     public int getMinSize() {
-    	return !YamlConfig.config.server.USE_ENABLE_SOLO_EXPEDITIONS ? minSize : 1;
+        return !YamlConfig.config.server.USE_ENABLE_SOLO_EXPEDITIONS ? minSize : 1;
     }
-    
+
     public int getMaxSize() {
         return maxSize;
     }
-    
+
     public int getMinLevel() {
-    	return minLevel;
+        return minLevel;
     }
-    
+
     public int getMaxLevel() {
-    	return maxLevel;
+        return maxLevel;
     }
-    
-    public int getRegistrationTime(){
-    	return registrationTime;
+
+    public int getRegistrationTime() {
+        return registrationTime;
     }
 }

src/main/java/server/partyquest/AriantColiseum.java

@@ -23,7 +23,7 @@ import client.Character;
 import constants.game.GameConstants;
 import server.TimerManager;
 import server.expeditions.Expedition;
-import server.expeditions.MapleExpeditionType;
+import server.expeditions.ExpeditionType;
 import server.maps.MapleMap;
 import tools.PacketCreator;
 
@@ -244,14 +244,14 @@ public class AriantColiseum {
         }
     }
     
-    private MapleExpeditionType getExpeditionType() {
-        MapleExpeditionType type;
+    private ExpeditionType getExpeditionType() {
+        ExpeditionType type;
         if (map.getId() == 980010101) {
-            type = MapleExpeditionType.ARIANT;
+            type = ExpeditionType.ARIANT;
         } else if (map.getId() == 980010201) {
-            type = MapleExpeditionType.ARIANT1;
+            type = ExpeditionType.ARIANT1;
         } else {
-            type = MapleExpeditionType.ARIANT2;
+            type = ExpeditionType.ARIANT2;
         }
         
         return type;