we do a little reformatting

of the ItemDamage event to keep it all in one location
sorry Carver, it's just easier to read :)

2 files changed, 7 insertions, 11 deletions

diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java
index b91ed56..86bf851 100644
--- a/src/main/java/com/MylesAndMore/tumble/EventListener.java
+++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java
@@ -1,5 +1,7 @@
 package com.MylesAndMore.tumble;
 
+import java.util.Objects;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -60,8 +62,10 @@ public class EventListener implements Listener{
         if (TumbleManager.getGameWorld() != null) {
             // Then check to see if the block was broken in the gameWorld,
             if (event.getPlayer().getWorld() == Bukkit.getWorld(TumbleManager.getGameWorld())) {
-                // If it was in the gameWorld, pass this event to the Game
-                Game.getGame().itemDamage(event);
+                // If it was in the gameWorld, check if the roundType was shovels
+                if (Objects.equals(Game.getGame().getRoundType(), "shovels")) {
+                    event.setCancelled(true);
+                }
             }
         }
     }
diff --git a/src/main/java/com/MylesAndMore/tumble/Game.java b/src/main/java/com/MylesAndMore/tumble/Game.java
index 793d4dd..6655081 100644
--- a/src/main/java/com/MylesAndMore/tumble/Game.java
+++ b/src/main/java/com/MylesAndMore/tumble/Game.java
@@ -233,14 +233,6 @@ public class Game {
         }
     }
 
-    public void itemDamage(PlayerItemDamageEvent event) {
-        // If the game type is shovels,
-        if (Objects.equals(roundType, "shovels")) {
-            // Cancel the event
-            event.setCancelled(true);
-        }
-    }
-
     public void playerDeath(@NotNull Player player) {
         player.setGameMode(GameMode.SPECTATOR);
         // If there are more than 2 players in the game,
@@ -294,7 +286,7 @@ public class Game {
     }
 
     // Methods to get the game type and game state for other classes outside the Game
-    private String getGameType() { return gameType; }
+    public String getRoundType() { return roundType; }
 
     public String getGameState() { return gameState; }