From 043d9705932da65bba9caa27d3450628143e3bd6 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Thu, 20 Aug 2020 23:45:07 +0200 Subject: [PATCH] Remove obsolete TODOs. Some of them have been mangled somehow, and others just straight up aren't relevant anymore. Tidy up! --- src/main/java/com/garbagemule/MobArena/ArenaImpl.java | 1 - src/main/java/com/garbagemule/MobArena/ArenaListener.java | 6 ------ .../garbagemule/MobArena/listeners/MAGlobalListener.java | 1 - .../java/com/garbagemule/MobArena/util/ClassChests.java | 1 - .../java/com/garbagemule/MobArena/waves/WaveParser.java | 4 ---- .../com/garbagemule/MobArena/waves/types/DefaultWave.java | 2 -- 6 files changed, 15 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java index 04f2fba..eb47822 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java @@ -514,7 +514,6 @@ public class ArenaImpl implements Arena // Teleport players, give full health, initialize map for (Player p : arenaPlayers) { - // TODO figure out how people die in lobby and get sent to spectator area early // Remove player from spec list to avoid invincibility issues if (inSpec(p)) { specPlayers.remove(p); diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index 49ebc28..285a313 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java @@ -134,12 +134,6 @@ public class ArenaListener this.region = arena.getRegion(); this.monsters = arena.getMonsterManager(); - /* - * TODO: Figure out if this is really a good idea + It saves needing all - * those methods in Arena.java + It is relatively simple + It would be - * fairly easy to implement an observer pattern - More private fields - - * Uglier code - */ ConfigurationSection s = arena.getSettings(); this.softRestore = s.getBoolean("soft-restore", false); this.softRestoreDrops = s.getBoolean("soft-restore-drops", false); diff --git a/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java index e9da435..5fb3c54 100644 --- a/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java +++ b/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java @@ -77,7 +77,6 @@ public class MAGlobalListener implements Listener // // /////////////////////////////////////////////////////////////////////////// - //TODO watch block physics, piston extend, and piston retract events @EventHandler(priority = EventPriority.HIGHEST) public void blockBreak(BlockBreakEvent event) { for (Arena arena : am.getArenas()) diff --git a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java index 29cfaac..a9c723d 100644 --- a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java +++ b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java @@ -68,7 +68,6 @@ public class ClassChests { } } - // TODO: Make number of searches configurable // First check the pillar below the sign Block block = findChestBelow(blockBelow, 6); diff --git a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java index 6a90c89..93a944f 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java +++ b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java @@ -423,10 +423,6 @@ public class WaveParser } private static List getPotionEffects(Arena arena, String name, ConfigurationSection config) { - /* - * TODO: Make this consistent with the rest somehow - * - Things only work for Players (currently) - */ List effects = config.getStringList("effects"); if (effects == null || effects.isEmpty()) { String value = config.getString("effects", null); diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java index 0f8a865..5605c3f 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java +++ b/src/main/java/com/garbagemule/MobArena/waves/types/DefaultWave.java @@ -54,8 +54,6 @@ public class DefaultWave extends AbstractWave break; } } - //TODO: Remember amount-multiplier. - // Return the map. return monsters; }