Reformat and clean up "server" package

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

@@ -35,36 +35,35 @@ import java.util.Map.Entry;
 import java.util.concurrent.ScheduledFuture;
 
 /**
- *
  * @author Ronan
  */
 public class AriantColiseum {
-    
+
     private Expedition exped;
     private MapleMap map;
-    
-    private Map<Character, Integer> score;
-    private Map<Character, Integer> rewardTier;
+
+    private final Map<Character, Integer> score;
+    private final Map<Character, Integer> rewardTier;
     private boolean scoreDirty = false;
-    
+
     private ScheduledFuture<?> ariantUpdate;
     private ScheduledFuture<?> ariantFinish;
     private ScheduledFuture<?> ariantScoreboard;
-    
+
     private int lostShards = 0;
-    
+
     private boolean eventClear = false;
-    
+
     public AriantColiseum(MapleMap eventMap, Expedition expedition) {
         exped = expedition;
         exped.finishRegistration();
-        
+
         map = eventMap;
         map.resetFully();
-        
+
         int pqTimer = 10 * 60 * 1000;
         int pqTimerBoard = (9 * 60 * 1000) + 50 * 1000;
-        
+
         List<Character> players = exped.getActiveMembers();
         score = new HashMap<>();
         rewardTier = new HashMap<>();
@@ -74,73 +73,73 @@ public class AriantColiseum {
             mc.updateAriantScore();
             rewardTier.put(mc, 0);
         }
-        
+
         for (Character mc : players) {
             mc.sendPacket(PacketCreator.updateAriantPQRanking(score));
         }
-        
+
         setAriantScoreBoard(TimerManager.getInstance().schedule(() -> showArenaResults(), pqTimerBoard));
-        
+
         setArenaFinish(TimerManager.getInstance().schedule(() -> enterKingsRoom(), pqTimer));
-        
+
         setArenaUpdate(TimerManager.getInstance().register(() -> broadcastAriantScoreUpdate(), 500, 500));
     }
-    
+
     private void setArenaUpdate(ScheduledFuture<?> ariantUpdate) {
         this.ariantUpdate = ariantUpdate;
     }
-    
+
     private void setArenaFinish(ScheduledFuture<?> arenaFinish) {
         this.ariantFinish = arenaFinish;
     }
-    
+
     private void setAriantScoreBoard(ScheduledFuture<?> ariantScore) {
         this.ariantScoreboard = ariantScore;
     }
-    
+
     private void cancelArenaUpdate() {
         if (ariantUpdate != null) {
             ariantUpdate.cancel(true);
             ariantUpdate = null;
         }
     }
-    
+
     private void cancelArenaFinish() {
         if (ariantFinish != null) {
             ariantFinish.cancel(true);
             ariantFinish = null;
         }
     }
-    
+
     private void cancelAriantScoreBoard() {
         if (ariantScoreboard != null) {
             ariantScoreboard.cancel(true);
             ariantScoreboard = null;
         }
     }
-    
+
     private void cancelAriantSchedules() {
         cancelArenaUpdate();
         cancelArenaFinish();
         cancelAriantScoreBoard();
     }
-    
+
     public int getAriantScore(Character chr) {
         Integer chrScore = score.get(chr);
         return chrScore != null ? chrScore : 0;
     }
-    
+
     public void clearAriantScore(Character chr) {
         score.remove(chr);
     }
-    
+
     public void updateAriantScore(Character chr, int points) {
         if (map != null) {
             score.put(chr, points);
             scoreDirty = true;
         }
     }
-    
+
     private void broadcastAriantScoreUpdate() {
         if (scoreDirty) {
             for (Character chr : score.keySet()) {
@@ -149,26 +148,26 @@ public class AriantColiseum {
             scoreDirty = false;
         }
     }
-    
+
     public int getAriantRewardTier(Character chr) {
         Integer reward = rewardTier.get(chr);
         return reward != null ? reward : 0;
     }
-    
+
     public void clearAriantRewardTier(Character chr) {
         rewardTier.remove(chr);
     }
-    
+
     public void addLostShards(int quantity) {
         lostShards += quantity;
     }
-    
+
     public void leaveArena(Character chr) {
         if (!(eventClear && GameConstants.isAriantColiseumArena(chr.getMapId()))) {
             leaveArenaInternal(chr);
         }
     }
-    
+
     private synchronized void leaveArenaInternal(Character chr) {
         if (exped != null) {
             if (exped.removeMember(chr)) {
@@ -177,53 +176,53 @@ public class AriantColiseum {
                     dispose();
                 }
                 chr.setAriantColiseum(null);
-                
+
                 int shards = chr.countItem(4031868);
                 chr.getAbstractPlayerInteraction().removeAll(4031868);
                 chr.updateAriantScore(shards);
             }
         }
     }
-    
+
     public void playerDisconnected(Character chr) {
         leaveArenaInternal(chr);
     }
-    
+
     private void showArenaResults() {
         eventClear = true;
-        
+
         if (map != null) {
             map.broadcastMessage(PacketCreator.showAriantScoreBoard());
             map.killAllMonsters();
-            
+
             distributeAriantPoints();
         }
     }
-    
+
     private static boolean isUnfairMatch(Integer winnerScore, Integer secondScore, Integer lostShardsScore, List<Integer> runnerupsScore) {
         if (winnerScore <= 0) {
             return false;
         }
-        
+
         double runnerupsScoreCount = 0;
         for (Integer i : runnerupsScore) {
             runnerupsScoreCount += i;
         }
-        
+
         runnerupsScoreCount += lostShardsScore;
         secondScore += lostShardsScore;
-        
+
         double matchRes = runnerupsScoreCount / winnerScore;
         double runnerupRes = ((double) secondScore) / winnerScore;
-        
+
         return matchRes < 0.81770726891980117713114871015349 && (runnerupsScoreCount < 7 || runnerupRes < 0.5929);
     }
-    
+
     public void distributeAriantPoints() {
         int firstTop = -1, secondTop = -1;
         Character winner = null;
         List<Integer> runnerups = new ArrayList<>();
-        
+
         for (Entry<Character, Integer> e : score.entrySet()) {
             Integer s = e.getValue();
             if (s > firstTop) {
@@ -233,17 +232,17 @@ public class AriantColiseum {
             } else if (s > secondTop) {
                 secondTop = s;
             }
-            
+
             runnerups.add(s);
             rewardTier.put(e.getKey(), (int) Math.floor(s / 10));
         }
-        
+
         runnerups.remove(firstTop);
         if (isUnfairMatch(firstTop, secondTop, map.getDroppedItemsCountById(4031868) + lostShards, runnerups)) {
             rewardTier.put(winner, 1);
         }
     }
-    
+
     private ExpeditionType getExpeditionType() {
         ExpeditionType type;
         if (map.getId() == 980010101) {
@@ -253,28 +252,28 @@ public class AriantColiseum {
         } else {
             type = ExpeditionType.ARIANT2;
         }
-        
+
         return type;
     }
-    
+
     private void enterKingsRoom() {
         exped.removeChannelExpedition(map.getChannelServer());
         cancelAriantSchedules();
-        
+
         for (Character chr : map.getAllPlayers()) {
             chr.changeMap(980010010, 0);
         }
     }
-    
+
     private synchronized void dispose() {
         if (exped != null) {
             exped.dispose(false);
-            
+
             for (Character chr : exped.getActiveMembers()) {
                 chr.setAriantColiseum(null);
                 chr.changeMap(980010000, 0);
             }
-            
+
             map.getWorldServer().registerTimedMapObject(() -> {
                 score.clear();
                 exped = null;