reformatting (this may break things)

removed some flagged imports and changed some of the regen code

might need to revert the commit...

4 files changed, 6 insertions, 25 deletions

diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java
index 3f28e89..1a8be98 100644
--- a/src/main/java/com/MylesAndMore/tumble/EventListener.java
+++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java
@@ -3,14 +3,11 @@ package com.MylesAndMore.tumble;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerItemDamageEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.util.Objects;
-
 public class EventListener implements Listener{
     @EventHandler
     public void PlayerJoinEvent(PlayerJoinEvent event) {
diff --git a/src/main/java/com/MylesAndMore/tumble/Game.java b/src/main/java/com/MylesAndMore/tumble/Game.java
index 887c4ee..8a81e01 100644
--- a/src/main/java/com/MylesAndMore/tumble/Game.java
+++ b/src/main/java/com/MylesAndMore/tumble/Game.java
@@ -3,11 +3,8 @@ package com.MylesAndMore.tumble;
 import com.MylesAndMore.tumble.api.Generator;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerItemDamageEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -67,8 +64,6 @@ public class Game {
                 giveItems(new ItemStack(Material.DIAMOND_SHOVEL));
                 // Send players to the game
                 sendPlayers();
-
-
                 // Keep in mind that after this runs, this command will complete and return true
             }
             else {
@@ -78,7 +73,6 @@ public class Game {
         else if (Objects.equals(TumbleManager.getGameType(), "snowballs")) {
             gameType = "snowballs";
             if (generateLayers(gameType)) {
-                // Reminder: we need a way to make this snowball infinite!
                 giveItems(new ItemStack(Material.SNOWBALL));
                 sendPlayers();
             }
@@ -216,17 +210,15 @@ public class Game {
         // Set the wins of the player to their current # of wins + 1
         gameWins.set(gamePlayers.indexOf(winner), (gameWins.get(gamePlayers.indexOf(winner)) + 1));
         Bukkit.getServer().broadcastMessage(ChatColor.GREEN + winner.getName() + " has won the round!");
+        // Clear old layers (as a fill command, this would be /fill ~-20 ~-4 ~-20 ~20 ~ ~20 relative to spawn)
+        Generator.generateCuboid(new Location(gameSpawn.getWorld(), gameSpawn.getX() - 20, gameSpawn.getY() - 4, gameSpawn.getZ() - 20), new Location(gameSpawn.getWorld(), gameSpawn.getX() + 20, gameSpawn.getY(), gameSpawn.getZ() + 20), Material.AIR);
+        // If the player has three wins, they won the game, so initiate the gameEnd
         if (gameWins.get(gamePlayers.indexOf(winner)) == 3)  {
             gameEnd(winner);
         }
+        // If that player doesn't have three wins, nobody else does, so we need another round
         else {
-            // Clear old layers
-            Location firstPos = new Location(gameSpawn.getWorld(), gameSpawn.getX() - 20, gameSpawn.getY() - 4, gameSpawn.getZ() - 20);
-            Location secondPos = new Location(gameSpawn.getWorld(), gameSpawn.getX() + 20, gameSpawn.getY(), gameSpawn.getZ() + 20);
-            Generator.generateCuboid(firstPos, secondPos, Material.AIR);
-            // Generate layers
-            // Debug
-            Bukkit.getServer().broadcastMessage(gameType);
+            // Re-generate layers
             generateLayers(gameType);
             // Teleport players
             // A new method will need to be written for this; current one only supports lobby
@@ -238,10 +230,7 @@ public class Game {
 
     private void gameEnd(@NotNull Player winner) {
         Bukkit.getServer().broadcastMessage(ChatColor.GOLD + winner.getName() + " has won the game!");
-        // Clear layers
-        Location firstPos = new Location(gameSpawn.getWorld(), gameSpawn.getX() - 20, gameSpawn.getY() - 4, gameSpawn.getZ() - 20);
-        Location secondPos = new Location(gameSpawn.getWorld(), gameSpawn.getX() + 20, gameSpawn.getY(), gameSpawn.getZ() + 20);
-        Generator.generateCuboid(firstPos, secondPos, Material.AIR);
+    
         // Send players back to lobby
     }
 
diff --git a/src/main/java/com/MylesAndMore/tumble/api/Generator.java b/src/main/java/com/MylesAndMore/tumble/api/Generator.java
index 5a1feba..1be071d 100644
--- a/src/main/java/com/MylesAndMore/tumble/api/Generator.java
+++ b/src/main/java/com/MylesAndMore/tumble/api/Generator.java
@@ -17,7 +17,6 @@ public class Generator {
             for (int x = Cx - radius; x <= Cx + radius; x++) {
                 for (int z = Cz - radius; z <= Cz + radius; z++) {
                     if ((Cx - x) * (Cx - x) + (Cz - z) * (Cz - z) <= rSq) {
-                        Location block = new Location(world, x, y, z);
                         world.getBlockAt(x, y, z).setType(material);
                     }
                 }
diff --git a/src/main/java/com/MylesAndMore/tumble/commands/StartGame.java b/src/main/java/com/MylesAndMore/tumble/commands/StartGame.java
index 85fd705..2e531ef 100644
--- a/src/main/java/com/MylesAndMore/tumble/commands/StartGame.java
+++ b/src/main/java/com/MylesAndMore/tumble/commands/StartGame.java
@@ -2,14 +2,10 @@ package com.MylesAndMore.tumble.commands;
 
 import com.MylesAndMore.tumble.Game;
 import com.MylesAndMore.tumble.TumbleManager;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.List;
 
 public class StartGame implements CommandExecutor {
     public void startGame(CommandSender sender, String[] args) {