1.7.0 beta 8

2 files changed, 24 insertions, 34 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/world/VoidGenerator.java b/src/main/java/net/tylermurphy/hideAndSeek/world/VoidGenerator.java
index b0ce824..15ff45f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/world/VoidGenerator.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/world/VoidGenerator.java
@@ -19,7 +19,9 @@
 
 package net.tylermurphy.hideAndSeek.world;
 
+import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;
@@ -36,41 +38,27 @@ public class VoidGenerator extends ChunkGenerator {
         return Collections.emptyList();
     }
 
-    public boolean shouldGenerateNoise() {
-    	return false;
-    }
-
-    public boolean shouldGenerateSurface() {
-    	return false;
-    }
-
-    public boolean shouldGenerateBedrock() {
-    	return false;
-    }
-
-    public boolean shouldGenerateCaves() {
-    	return false;
-    }
-
-    public boolean shouldGenerateDecorations() {
-    	return false;
+    @Override
+    public boolean canSpawn(World world, int x, int z) {
+        return true;
     }
 
-    public boolean shouldGenerateMobs() {
-    	return false;
+    @Override
+    public Location getFixedSpawnLocation(World world, Random random) {
+        return new Location(world, 0, 100, 0);
     }
 
-    public boolean shouldGenerateStructures() {
-    	return false;
-    }
+    // 1.13 And Prev
+    public ChunkData generateChunkData(World world, Random random, int chunkX, int chunkZ, BiomeGrid biome) {
+        ChunkData chunkData = super.createChunkData(world);
 
-    public boolean canSpawn(@NotNull World world, int x, int z) {
-        return true;
-    }
+        for(int x = 0; x < 16; x++) {
+            for(int z = 0; z < 16; z++) {
+                biome.setBiome(x, z, Biome.PLAINS);
+            }
+        }
 
-    // 1.13 And Prev
-    public @NotNull ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
-        return createChunkData(world);
+        return chunkData;
     }
 
     // 1.8
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java b/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java
index 6ea1773..864397e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/world/WorldLoader.java
@@ -50,11 +50,13 @@ public class WorldLoader {
 			return;
 		}
 		world.getPlayers().forEach(player -> exitPosition.teleport(player));
-        if (Bukkit.getServer().unloadWorld(world, false)) {
-            Main.getInstance().getLogger().info("Successfully unloaded " + map.getGameSpawnName());
-        }else{
-            Main.getInstance().getLogger().severe("COULD NOT UNLOAD " + map.getGameSpawnName());
-        }
+		Main.getInstance().scheduleTask(() -> {
+			if (Bukkit.getServer().unloadWorld(world, false)) {
+				Main.getInstance().getLogger().info("Successfully unloaded " + map.getGameSpawnName());
+			} else {
+				Main.getInstance().getLogger().severe("COULD NOT UNLOAD " + map.getGameSpawnName());
+			}
+		});
     }
 
     public void loadMap() {