Make superflat check more accurate

Will allow fix superflat to run in SkyGrid. BentoBoxWorld/SkyGrid#22
BentoBoxWorld · Jul 27, 2019 · 10b8c51 · 10b8c51
1 parent 2403cd2
commit 10b8c51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/...in/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListener.java b/...in/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListener.java
@@ -111,15 +111,11 @@ private boolean noClean(World world, ChunkLoadEvent e) {
         if (!ready) {
             return true;
         }
-        // Clean super flat does not work if the world handles its own generator explicitly
-        if (getIWM().inWorld(world) && Flags.CLEAN_SUPER_FLAT.isSetForWorld(world) && getIWM().isUseOwnGenerator(world)) {
-            Flags.CLEAN_SUPER_FLAT.setSetting(world, false);
-            getPlugin().logWarning("Clean super flat is not available for " + world.getName());
-            return true;
-        }
-
         if (!getIWM().inWorld(world) || !Flags.CLEAN_SUPER_FLAT.isSetForWorld(world) ||
-                (!e.getChunk().getBlock(0, 0, 0).getType().equals(Material.BEDROCK)
+                (!(e.getChunk().getBlock(0, 0, 0).getType().equals(Material.BEDROCK)
+                        && e.getChunk().getBlock(0, 1, 0).getType().equals(Material.DIRT)
+                        && e.getChunk().getBlock(0, 2, 0).getType().equals(Material.DIRT)
+                        && e.getChunk().getBlock(0, 3, 0).getType().equals(Material.GRASS_BLOCK))
                         || (world.getEnvironment().equals(Environment.NETHER) && (!plugin.getIWM().isNetherGenerate(world)
                                 || !plugin.getIWM().isNetherIslands(world)))
                         || (world.getEnvironment().equals(Environment.THE_END) && (!plugin.getIWM().isEndGenerate(world)

diff --git a/...ava/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java b/...ava/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
@@ -101,7 +101,8 @@ public void setUp() throws Exception {
         chunk = mock(Chunk.class);
         when(chunk.getWorld()).thenReturn(world);
         block = mock(Block.class);
-        when(block.getType()).thenReturn(Material.BEDROCK);
+        // Super flat!
+        when(block.getType()).thenReturn(Material.BEDROCK, Material.DIRT, Material.DIRT, Material.GRASS_BLOCK);
         when(chunk.getBlock(Mockito.anyInt(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(block);
 
         // Fire the ready event