From c25ddf063a808e3adb749e22017661f403c5fb7e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 17 Nov 2016 12:41:03 +1100
Subject: Update to Minecraft 1.11

---
 nms-patches/BlockPortal.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'nms-patches/BlockPortal.patch')

diff --git a/nms-patches/BlockPortal.patch b/nms-patches/BlockPortal.patch
index 90264c38..064c6f62 100644
--- a/nms-patches/BlockPortal.patch
+++ b/nms-patches/BlockPortal.patch
@@ -13,7 +13,7 @@
 @@ -43,7 +46,8 @@
              }
  
-             if (i > 0 && !world.getType(blockposition1.up()).l()) {
+             if (i > 0 && !world.getType(blockposition1.up()).m()) {
 -                Entity entity = ItemMonsterEgg.a(world, EntityTypes.getName(EntityPigZombie.class), (double) blockposition1.getX() + 0.5D, (double) blockposition1.getY() + 1.1D, (double) blockposition1.getZ() + 0.5D);
 +                // CraftBukkit - set spawn reason to NETHER_PORTAL
 +                Entity entity = ItemMonsterEgg.spawnCreature(world, EntityTypes.getName(EntityPigZombie.class), (double) blockposition1.getX() + 0.5D, (double) blockposition1.getY() + 1.1D, (double) blockposition1.getZ() + 0.5D, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NETHER_PORTAL);
@@ -52,7 +52,7 @@
              entity.e(blockposition);
          }
  
-@@ -254,6 +264,7 @@
+@@ -212,6 +222,7 @@
          private BlockPosition position;
          private int height;
          private int width;
@@ -60,7 +60,7 @@
  
          public Shape(World world, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
              this.a = world;
-@@ -312,6 +323,10 @@
+@@ -270,6 +281,10 @@
          }
  
          protected int c() {
@@ -71,7 +71,7 @@
              int i;
  
              label56:
-@@ -332,11 +347,21 @@
+@@ -290,11 +305,21 @@
                          block = this.a.getType(blockposition.shift(this.d)).getBlock();
                          if (block != Blocks.OBSIDIAN) {
                              break label56;
@@ -93,7 +93,7 @@
                          }
                      }
                  }
-@@ -346,6 +371,11 @@
+@@ -304,6 +329,11 @@
                  if (this.a.getType(this.position.shift(this.c, i).up(this.height)).getBlock() != Blocks.OBSIDIAN) {
                      this.height = 0;
                      break;
@@ -105,7 +105,7 @@
                  }
              }
  
-@@ -367,7 +397,27 @@
+@@ -325,7 +355,27 @@
              return this.position != null && this.width >= 2 && this.width <= 21 && this.height >= 3 && this.height <= 21;
          }
  
@@ -134,7 +134,7 @@
              for (int i = 0; i < this.width; ++i) {
                  BlockPosition blockposition = this.position.shift(this.c, i);
  
-@@ -376,6 +426,7 @@
+@@ -334,6 +384,7 @@
                  }
              }
  
-- 
cgit v1.2.3