diff options
Diffstat (limited to 'src/main/java/com/MylesAndMore/tumble/Game.java')
| -rw-r--r-- | src/main/java/com/MylesAndMore/tumble/Game.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/MylesAndMore/tumble/Game.java b/src/main/java/com/MylesAndMore/tumble/Game.java index 63c68df..b08dfd3 100644 --- a/src/main/java/com/MylesAndMore/tumble/Game.java +++ b/src/main/java/com/MylesAndMore/tumble/Game.java @@ -86,14 +86,17 @@ public class Game { gameType = "mixed"; // Mixed gamemode (choose random shovels or snowballs) if (Random.nextInt(2) == 0) { + roundType = "shovels"; generateLayers("shovels"); giveItems(new ItemStack(Material.DIAMOND_SHOVEL)); sendPlayers(); } else { + roundType = "snowballs"; generateLayers("snowballs"); giveItems(new ItemStack(Material.SNOWBALL)); sendPlayers(); + } } else { @@ -111,7 +114,7 @@ public class Game { private boolean generateLayers(String gameType) { Location layer = new Location(gameSpawn.getWorld(), gameSpawn.getX(), gameSpawn.getY(), gameSpawn.getZ(), gameSpawn.getYaw(), gameSpawn.getPitch()); - if (Objects.equals(gameType, "shovels")) { + if (Objects.equals(roundType, "shovels")) { layer.setY(layer.getY() - 1); Generator.generateLayer(layer, 17, 1, Material.SNOW_BLOCK); Generator.generateLayer(layer, 13, 1, Material.AIR); @@ -123,7 +126,7 @@ public class Game { Generator.generateLayer(layer, 4, 2, Material.TALL_GRASS); roundType = "shovels"; } - else if (Objects.equals(gameType, "snowballs")) { + else if (Objects.equals(roundType, "snowballs")) { layer.setY(layer.getY() - 1); Generator.generateLayer(layer, 17, 1, Material.COAL_ORE); Generator.generateLayer(layer, 13, 1, Material.AIR); @@ -137,10 +140,8 @@ public class Game { else if (Objects.equals(gameType, "mixed")) { if (Random.nextInt(2) == 0) { generateLayers("shovels"); - roundType = "shovels"; } else { generateLayers("snowballs"); - roundType = "snowballs"; } } else { |