added more debug outputs when duels are ended. Should make finding of…

… when duels are not resetting more easier.
teozfrank · Nov 10, 2014 · 7badeec · 7badeec
1 parent 9ee2e01
commit 7badeec
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/src/main/java/com/teozcommunity/teozfrank/duelme/util/DuelManager.java b/src/main/java/com/teozcommunity/teozfrank/duelme/util/DuelManager.java
@@ -383,7 +383,6 @@ public void acceptRequest(Player accepter, String senderIn) {
         } else {
             Util.sendMsg(accepter, ChatColor.RED +
                     "You do not have any duel requests from " + ChatColor.AQUA + senderIn + ".");
-            return;
         }
 
     }
@@ -638,6 +637,9 @@ public void restorePlayerData(Player player) {
      * @param player the player
      */
     public void endDuel(Player player) {
+        if(plugin.isDebugEnabled()) {
+            SendConsoleMessage.debug("End duel.");
+        }
         ItemManager im = plugin.getItemManager();
         String playerName = player.getName();
         UUID playerUUID = player.getUniqueId();
@@ -667,6 +669,9 @@ public void endDuel(Player player) {
      * @param arena the arena to be ended
      */
     public void endDuel(DuelArena arena) {
+        if(plugin.isDebugEnabled()) {
+            SendConsoleMessage.debug("End duel by duel arena.");
+        }
         ItemManager im = plugin.getItemManager();
         DuelManager dm = plugin.getDuelManager();
         FileManager fm = plugin.getFileManager();
@@ -695,10 +700,7 @@ public void endDuel(DuelArena arena) {
             arena.getPlayers().remove(playerUUID);//remove the player
         }
 
-        arena.setHasBet(false);
-        arena.setBetAmount(0);
-        arena.getPlayers().clear();
-        arena.setDuelState(DuelState.WAITING);
+        this.resetArena(arena);
     }
 
     /**
@@ -714,4 +716,18 @@ public boolean hasEnoughMoney(String player, double amount) {
         }
         return false;
     }
+
+    /**
+     * reset a duel arena to initial state
+     * @param arena the duel arena
+     */
+    public void resetArena(DuelArena arena) {
+        if(plugin.isDebugEnabled()) {
+            SendConsoleMessage.debug("resetting arena.");
+        }
+        arena.setHasBet(false);
+        arena.setBetAmount(0);
+        arena.getPlayers().clear();
+        arena.setDuelState(DuelState.WAITING);
+    }
 }
diff --git a/src/main/java/com/teozcommunity/teozfrank/duelme/util/ItemManager.java b/src/main/java/com/teozcommunity/teozfrank/duelme/util/ItemManager.java
@@ -95,10 +95,7 @@ public void rewardPlayer(DuelArena arena) {
                 }
             }
 
-            arena.setHasBet(false);
-            arena.setBetAmount(0);
-            arena.getPlayers().clear();
-            arena.setDuelState(DuelState.WAITING);
+            dm.resetArena(arena);
         }
 
     }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: DuelMe
-version: 0.9.9 Beta
+version: 0.9.9.1 Beta
 author: teozfrank
 description: allows players to duel each other in a controlled environment
 main: com.teozcommunity.teozfrank.duelme.main.DuelMe
@@ -17,12 +17,12 @@ commands:
         useage: /<command>
 permissions:
     duelme.*:
-        description: Gives access to all toolkit permissions
+        description: Gives access to all duelme permissions
         children:
             duelme.player.*: true
             duelme.admin.*: true
     duelme.admin.*:
-        description: Gives access to all toolkit staff commands
+        description: Gives access to all duelme admin commands
         children:
             duelme.admin.info: true
             duelme.admin.create: true