Spigot / CraftBukkit / 7029c0a8f3e

Commits

SPIGOT-6311: Don't calculate portal shapes for up/down directions

Modified

-26
-27
+         }
-28
+     }
-29
-30
+     private static boolean a(World world) {
-31
+-        return world.getDimensionKey() == World.OVERWORLD || world.getDimensionKey() == World.THE_NETHER;
-32
++        return world.getTypeKey() == DimensionManager.OVERWORLD || world.getTypeKey() == DimensionManager.THE_NETHER; // CraftBukkit - getTypeKey()
-33
+     }
-34
-35
+     @Override
--
+@@ -103,4 +110,12 @@
-+
+@@ -83,6 +90,12 @@
-+
+     }
-+
-+
+     private static boolean b(World world, BlockPosition blockposition, EnumDirection enumdirection) {
-+
++        // CraftBukkit start - SPIGOT-6311: Do not calculate portals for up/down directions
-+
++        if (enumdirection == EnumDirection.UP || enumdirection == EnumDirection.DOWN) {
-+
++            return false;
-+
++        }
-+
++        // CraftBukkit end
 +
-+
+         if (!a(world)) {
-+
+             return false;
-+
+         } else {
-+
+@@ -103,4 +116,12 @@
-50
+             return flag && BlockPortalShape.a((GeneratorAccess) world, blockposition, enumdirection.h().n()).isPresent();
-51
+         }
-52
+     }
-53
++
-54
++    // CraftBukkit start
-55
++    protected void fireExtinguished(GeneratorAccess world, BlockPosition position) {
-56
++        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, position, Blocks.AIR.getBlockData()).isCancelled()) {
-57
++            world.a(position, false);
-58
++        }
-59
++    }