diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java b/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java index 887ef0f0..12a57748 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java @@ -185,9 +185,6 @@ public class DungeonsXL extends BRPlugin { // Stop shedulers getServer().getScheduler().cancelTasks(this); - - // DebukkIt - debug.save(); } // Init. @@ -671,7 +668,4 @@ public class DungeonsXL extends BRPlugin { return dGroups; } - // DebukkIt - public final io.github.dre2n.debukkit.DebukkIt debug = new io.github.dre2n.debukkit.DebukkIt(this); - } diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java index 6e2e47a5..836526d4 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java @@ -406,7 +406,6 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGH) public void onQuit(PlayerQuitEvent event) { - plugin.debug.start("PlayerListener#onQuit"); Player player = event.getPlayer(); DGlobalPlayer dPlayer = dPlayers.getByPlayer(player); DGroup dGroup = DGroup.getByPlayer(player); @@ -435,7 +434,6 @@ public class PlayerListener implements Listener { } else if (dPlayer instanceof DEditPlayer) { ((DEditPlayer) dPlayer).leave(); } - plugin.debug.end("PlayerListener#onQuit", true); } @EventHandler(priority = EventPriority.NORMAL) diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java index 9da3c6ed..f2790616 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java @@ -86,7 +86,6 @@ public class DGamePlayer extends DInstancePlayer { public DGamePlayer(Player player, DGameWorld world) { super(player, world.getWorld()); - plugin.debug.start("DGamePlayer#init"); Game game = Game.getByGameWorld(world); if (game == null) { game = new Game(DGroup.getByPlayer(player)); @@ -112,7 +111,6 @@ public class DGamePlayer extends DInstancePlayer { } else { PlayerUtil.secureTeleport(player, teleport); } - plugin.debug.end("DGamePlayer#init", true); } /** @@ -233,10 +231,8 @@ public class DGamePlayer extends DInstancePlayer { * the dClass to set */ public void setDClass(String className) { - plugin.debug.start("DGamePlayer#setDClass"); Game game = Game.getByWorld(getPlayer().getWorld()); if (game == null) { - plugin.debug.end("DGamePlayer#setDClass", true); return; } @@ -299,7 +295,6 @@ public class DGamePlayer extends DInstancePlayer { } } } - plugin.debug.end("DGamePlayer#setDClass", true); } /** @@ -752,7 +747,6 @@ public class DGamePlayer extends DInstancePlayer { DGamePlayer dPlayer = getByPlayer(player); if (!dPlayer.finished) { MessageUtil.sendMessage(this.getPlayer(), DMessages.PLAYER_WAIT_FOR_OTHER_PLAYERS.getMessage()); - plugin.debug.end("DGamePlayer#finishFloor", true); return; } } @@ -771,7 +765,6 @@ public class DGamePlayer extends DInstancePlayer { } if (invalid) { - plugin.debug.end("DGamePlayer#finishFloor", true); return; } @@ -811,7 +804,6 @@ public class DGamePlayer extends DInstancePlayer { } } dGroup.startGame(game); - plugin.debug.end("DGamePlayer#finishFloor", true); } /** @@ -869,7 +861,6 @@ public class DGamePlayer extends DInstancePlayer { DGroupFinishDungeonEvent dGroupFinishDungeonEvent = new DGroupFinishDungeonEvent(dGroup); if (dGroupFinishDungeonEvent.isCancelled()) { - plugin.debug.end("DGamePlayer#finish", true); return; } diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java index 203daa65..034d38b9 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java @@ -149,7 +149,6 @@ public class DEditWorld extends DInstanceWorld { * whether this world should be saved */ public void delete(final boolean save) { - plugin.debug.start("DEditWorld#delete"); EditWorldUnloadEvent event = new EditWorldUnloadEvent(this, true); plugin.getServer().getPluginManager().callEvent(event); @@ -192,7 +191,6 @@ public class DEditWorld extends DInstanceWorld { } }.runTaskAsynchronously(plugin); } - plugin.debug.end("DEditWorld#delete", true); } /* Statics */ diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java index c85ed7e6..adb37327 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java @@ -382,7 +382,6 @@ public class DGameWorld extends DInstanceWorld { * @return the potential amount of mobs in the world */ public int getMobCount() { - plugin.debug.start("DGameWorld#getMobCount"); int mobCount = 0; signs: @@ -402,7 +401,6 @@ public class DGameWorld extends DInstanceWorld { mobCount += ((MobSign) dSign).getInitialAmount(); } - plugin.debug.end("DGameWorld#getMobCount", true); return mobCount; } @@ -462,7 +460,6 @@ public class DGameWorld extends DInstanceWorld { */ @Override public void delete() { - plugin.debug.start("DGameWorld#delete"); GameWorldUnloadEvent event = new GameWorldUnloadEvent(this); plugin.getServer().getPluginManager().callEvent(event); @@ -486,7 +483,6 @@ public class DGameWorld extends DInstanceWorld { } }.runTaskAsynchronously(plugin); } - plugin.debug.end("DGameWorld#delete", true); } /** diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java index 02f06c93..bbeffac2 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java @@ -204,7 +204,6 @@ public class DResourceWorld { * @return an instance of this world */ public DInstanceWorld instantiate(final boolean game) { - plugin.debug.start("DResourceWorld#instantiate"); int id = worlds.generateId(); String name = worlds.generateName(game); final File instanceFolder = new File(Bukkit.getWorldContainer(), name); @@ -246,7 +245,6 @@ public class DResourceWorld { }.runTaskAsynchronously(plugin); } - plugin.debug.end("DResourceWorld#instantiate", true); return instance; } @@ -276,7 +274,6 @@ public class DResourceWorld { * @return the automatically created DEditWorld instance */ public DEditWorld generate() { - plugin.debug.start("DResourceWorld#generate"); final String name = worlds.generateName(false); int id = worlds.generateId(); final File folder = new File(Bukkit.getWorldContainer(), name); @@ -306,7 +303,6 @@ public class DResourceWorld { }.runTaskAsynchronously(plugin); } - plugin.debug.end("DResourceWorld#generate", true); return editWorld; } diff --git a/pom.xml b/pom.xml index 68bf86fe..f6dbabbc 100644 --- a/pom.xml +++ b/pom.xml @@ -38,11 +38,6 @@ commons 1.0.3 - - io.github.dre2n - debukkit - 2.1 - io.github.dre2n caliburn diff --git a/shade/pom.xml b/shade/pom.xml index becf0c70..d64882a1 100644 --- a/shade/pom.xml +++ b/shade/pom.xml @@ -38,7 +38,6 @@ io.github.dre2n:commons io.github.dre2n:caliburn - io.github.dre2n:debukkit io.github.dre2n:dungeonsxl-* org.inventivetalent.resourcepackapi:api