Fix a merge conflict that was resolved improperly

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,4 +1,4 @@
-From b886700e69bed39ac24603f4797371680ba0ffab Mon Sep 17 00:00:00 2001
+From 4660534c254ab344d692fba1eb56b0343f4edf21 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -1103,7 +1103,7 @@ index 6958a2e..b3d3df4 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index dcd6fc1..f694bf5 100644
+index dcd6fc1..1867593 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1161,7 +1161,7 @@ index dcd6fc1..f694bf5 100644
          int entitiesThisCycle = 0;
          if (tickPosition < 0) tickPosition = 0;
          for (entityLimiter.initTick();
-@@ -1432,10 +1435,14 @@ public abstract class World implements IBlockAccess {
+@@ -1432,10 +1435,11 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead && !(entity instanceof EntityPlayer)) {
                  try {
@@ -1169,16 +1169,13 @@ index dcd6fc1..f694bf5 100644
 +                    entity.tickTimer.startTiming(); // Paper
                      this.h(entity);
 -                    SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
-+                    entity.tickTimer.stopTiming(); // Paper
-+                    entity.tickTimer.startTiming(); // Paper
-+                    this.g(entity);
 +                    entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
 +                    entity.tickTimer.stopTiming();
                      crashreport1 = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
                      entity.appendEntityCrashDetails(crashreportsystemdetails1);
-@@ -1568,6 +1575,7 @@ public abstract class World implements IBlockAccess {
+@@ -1568,6 +1572,7 @@ public abstract class World implements IBlockAccess {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -1186,7 +1183,7 @@ index dcd6fc1..f694bf5 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1620,7 +1628,6 @@ public abstract class World implements IBlockAccess {
+@@ -1620,7 +1625,6 @@ public abstract class World implements IBlockAccess {
              entity.ticksLived++;
              entity.inactiveTick();
          } else {
@@ -1194,7 +1191,7 @@ index dcd6fc1..f694bf5 100644
              // CraftBukkit end
              entity.M = entity.locX;
              entity.N = entity.locY;
-@@ -1629,6 +1636,7 @@ public abstract class World implements IBlockAccess {
+@@ -1629,6 +1633,7 @@ public abstract class World implements IBlockAccess {
              entity.lastPitch = entity.pitch;
              if (flag && entity.aa) {
                  ++entity.ticksLived;
@@ -1202,7 +1199,7 @@ index dcd6fc1..f694bf5 100644
                  if (entity.isPassenger()) {
                      entity.aw();
                  } else {
-@@ -1687,8 +1695,6 @@ public abstract class World implements IBlockAccess {
+@@ -1687,8 +1692,6 @@ public abstract class World implements IBlockAccess {
                      }
                  }
              }

Spigot-Server-Patches/0016-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From 066cd36ae439a3797d875ea96e09264bfdff58cd Mon Sep 17 00:00:00 2001
+From c36382de32e928b4d76ce823104cfea9573abf90 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
@@ -57,10 +57,10 @@ index 17bf3e4..a05fad5 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 36c2dfb..1a6803a 100644
+index c5c4fad..64120c7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2725,7 +2725,7 @@ public abstract class World implements IBlockAccess {
+@@ -2722,7 +2722,7 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
  

Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch

@@ -1,4 +1,4 @@
-From 0861215886567d4dff9f6d534845572d9a0a1de6 Mon Sep 17 00:00:00 2001
+From 6df7029f533e6e05f08e701e3ab6e2f4aaaaa59f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -23,10 +23,10 @@ index b3d3df4..d0c0371 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 629ea2e..40b8bf3 100644
+index 4544c22..8352ac1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1450,10 +1450,12 @@ public abstract class World implements IBlockAccess {
+@@ -1447,10 +1447,12 @@ public abstract class World implements IBlockAccess {
                      entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
@@ -43,7 +43,7 @@ index 629ea2e..40b8bf3 100644
                  }
              }
  
-@@ -1516,10 +1518,13 @@ public abstract class World implements IBlockAccess {
+@@ -1513,10 +1515,13 @@ public abstract class World implements IBlockAccess {
                          ((ITickable) tileentity).F_();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {

Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch

@@ -1,4 +1,4 @@
-From 9a7b96b67c61f7efed2231b2ac695b71fd28116f Mon Sep 17 00:00:00 2001
+From 2e1c0867bef244dc97364bc05d6e7bc9ce078977 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed

Spigot-Server-Patches/0036-Add-player-view-distance-API.patch

@@ -1,11 +1,11 @@
-From 16e9f633d0e8dfafc9ae804697b3b18e12312aec Mon Sep 17 00:00:00 2001
+From 886c56449b243cfcf0e0f38a476926453e4dd522 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ca9e94a..1982749 100644
+index dc02472..80e7105 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -56,6 +56,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch

@@ -1,11 +1,11 @@
-From 171cc5dd20887c2d3ebc13f3a7e08e8d42969911 Mon Sep 17 00:00:00 2001
+From 7a0cf132ed539cf93b18b2e6cae47ea06629d87c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 23aad3f..bfe0ee2 100644
+index d5f5a32..cdc573f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1424,10 +1424,10 @@ public abstract class World implements IBlockAccess {
@@ -23,7 +23,7 @@ index 23aad3f..bfe0ee2 100644
              tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1496,9 +1496,7 @@ public abstract class World implements IBlockAccess {
+@@ -1493,9 +1493,7 @@ public abstract class World implements IBlockAccess {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;

Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch

@@ -1,4 +1,4 @@
-From c93f33417194cd9bcda84b504302b6fd80bb6134 Mon Sep 17 00:00:00 2001
+From 60c5846a56e80a3d1dbec352fbb9f58070736bff Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius

Spigot-Server-Patches/0062-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 2d7c77d02cb0f23577e767cc4d0d04b7634d08f0 Mon Sep 17 00:00:00 2001
+From 96b29581462ad920aeb31e3f2cc023f13bcdbb71 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ad8c031..ceb0d71 100644
+index d762dae..62ef12f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -303,7 +303,7 @@ index ad8c031..ceb0d71 100644
  import com.google.common.base.Function;
  import com.google.common.base.Objects;
  import com.google.common.base.Predicate;
-@@ -1458,8 +1460,10 @@ public abstract class World implements IBlockAccess {
+@@ -1455,8 +1457,10 @@ public abstract class World implements IBlockAccess {
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
                      // Paper start - Prevent tile entity and entity crashes
@@ -315,7 +315,7 @@ index ad8c031..ceb0d71 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1524,8 +1528,10 @@ public abstract class World implements IBlockAccess {
+@@ -1521,8 +1525,10 @@ public abstract class World implements IBlockAccess {
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes

Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -1,4 +1,4 @@
-From 630e43a63942dbef4177ad3354f9fdf677bc4823 Mon Sep 17 00:00:00 2001
+From 18310a06e098788f1d0deebef0f80b561ac0d4dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e0e563c..bfb30d9 100644
+index 9bb0d25..07b9626 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
@@ -227,7 +227,7 @@ index e0e563c..bfb30d9 100644
  
      public boolean B() {
          return this.J < 4;
-@@ -2020,7 +2029,7 @@ public abstract class World implements IBlockAccess {
+@@ -2017,7 +2026,7 @@ public abstract class World implements IBlockAccess {
      public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
      @Nullable
      public TileEntity getTileEntity(BlockPosition blockposition) {
@@ -236,7 +236,7 @@ index e0e563c..bfb30d9 100644
              return null;
          } else {
              // CraftBukkit start
-@@ -2061,7 +2070,7 @@ public abstract class World implements IBlockAccess {
+@@ -2058,7 +2067,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@@ -245,7 +245,7 @@ index e0e563c..bfb30d9 100644
              if (tileentity != null && !tileentity.y()) {
              // CraftBukkit start
              if (captureBlockStates) {
-@@ -2124,7 +2133,7 @@ public abstract class World implements IBlockAccess {
+@@ -2121,7 +2130,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean d(BlockPosition blockposition, boolean flag) {

Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 8f7a21dbb05376414fe4a0dd515a4f28856fcea9 Mon Sep 17 00:00:00 2001
+From ec75f3a8d8eb440fd682d09063f590595590297f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -39,10 +39,10 @@ index fc433f9..2fc3e94 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 26166bd..fa92054 100644
+index abf4350..a2decad 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3197,8 +3197,9 @@ public abstract class World implements IBlockAccess {
+@@ -3194,8 +3194,9 @@ public abstract class World implements IBlockAccess {
          int k = i * 16 + 8 - blockposition.getX();
          int l = j * 16 + 8 - blockposition.getZ();
          boolean flag = true;

Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch

@@ -1,14 +1,14 @@
-From c15ffc7835e107600a83dacbdf2265e7287e5905 Mon Sep 17 00:00:00 2001
+From 57220f575c59a8cbaa23d459974e3a34f75fe90e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 70cd195..2e686ae 100644
+index 222b316..b988699 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3193,6 +3193,7 @@ public abstract class World implements IBlockAccess {
+@@ -3190,6 +3190,7 @@ public abstract class World implements IBlockAccess {
          return this.N;
      }
  

Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From 7b9087f509a179e0f0f8ccff52552ac94970a8ba Mon Sep 17 00:00:00 2001
+From 0080f4b4bc4f3d05b7f37da4045656bb9f63437f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2e686ae..7ab4f45 100644
+index b988699..3747881 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -18,7 +18,7 @@ index 2e686ae..7ab4f45 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> b = Lists.newArrayList();
      private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
-@@ -1572,7 +1572,7 @@ public abstract class World implements IBlockAccess {
+@@ -1569,7 +1569,7 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - From below, clean up tile entities before ticking them
          if (!this.tileEntityListUnload.isEmpty()) {
              this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -27,7 +27,7 @@ index 2e686ae..7ab4f45 100644
              this.tileEntityListUnload.clear();
          }
          // CraftBukkit end
-@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess {
+@@ -1620,7 +1620,7 @@ public abstract class World implements IBlockAccess {
              if (tileentity.y()) {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
@@ -36,7 +36,7 @@ index 2e686ae..7ab4f45 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
                  }
-@@ -1661,7 +1661,7 @@ public abstract class World implements IBlockAccess {
+@@ -1658,7 +1658,7 @@ public abstract class World implements IBlockAccess {
                          this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
                          // CraftBukkit start
                          // From above, don't screw this up - SPIGOT-1746
@@ -45,7 +45,7 @@ index 2e686ae..7ab4f45 100644
                              this.a(tileentity1);
                          }
                          // CraftBukkit end
-@@ -1681,9 +1681,9 @@ public abstract class World implements IBlockAccess {
+@@ -1678,9 +1678,9 @@ public abstract class World implements IBlockAccess {
      protected void l() {}
  
      public boolean a(TileEntity tileentity) {
@@ -57,7 +57,7 @@ index 2e686ae..7ab4f45 100644
              this.tileEntityListTick.add(tileentity);
          }
  
-@@ -2117,7 +2117,7 @@ public abstract class World implements IBlockAccess {
+@@ -2114,7 +2114,7 @@ public abstract class World implements IBlockAccess {
          } else {
              if (tileentity != null) {
                  this.b.remove(tileentity);

Spigot-Server-Patches/0162-Chunk-registration-fixes.patch

@@ -1,4 +1,4 @@
-From b54ce0d0711f6df62b08b6cb02c5837ea7ee3601 Mon Sep 17 00:00:00 2001
+From 3a9bc72191750a7a2283aa5cf9cd09642bc06ec5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e833657..5d64d55 100644
+index 1925485..2434007 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1766,7 +1766,7 @@ public abstract class World implements IBlockAccess {
+@@ -1763,7 +1763,7 @@ public abstract class World implements IBlockAccess {
              }
  
              int k = MathHelper.floor(entity.locX / 16.0D);

Spigot-Server-Patches/0180-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From 6593c8f93e61d4081080be004a777d32bc20c332 Mon Sep 17 00:00:00 2001
+From cb3aa8961d8f87ea76901499ce0a13a3a28103f8 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -66,7 +66,7 @@ index f772c7c..f5dc144 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b3c1f55..6f6eef9 100644
+index b3c1f55..6a0b3a6 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
@@ -87,12 +87,12 @@ index b3c1f55..6f6eef9 100644
 -                                this.b.b = i;
 -                                this.b.c = j;
 -                                ++this.b.d;
-+                            if (((BaseBlockPosition)this.b).a < l) {
++                            if (((BaseBlockPosition) this.b).a < l) {
-+                                ++((BaseBlockPosition)this.b).a;
++                                ++((BaseBlockPosition) this.b).a;
-+                            } else if (((BaseBlockPosition)this.b).b < i1) {
++                            } else if (((BaseBlockPosition) this.b).b < i1) {
-+                                ((BaseBlockPosition)this.b).a = i;
++                                ((BaseBlockPosition) this.b).a = i;
-+                                ++((BaseBlockPosition)this.b).b;
++                                ++((BaseBlockPosition) this.b).b;
-+                            } else if (((BaseBlockPosition)this.b).c < j1) {
++                            } else if (((BaseBlockPosition) this.b).c < j1) {
 +                                ((BaseBlockPosition) this.b).a = i;
 +                                ((BaseBlockPosition) this.b).b = j;
 +                                ++((BaseBlockPosition) this.b).c;

Spigot-Server-Patches/0183-Vanished-players-don-t-have-rights.patch

@@ -1,4 +1,4 @@
-From 66c5ebb38b7af48e9e573cdad699574000ebdda3 Mon Sep 17 00:00:00 2001
+From 3c779ce69d795fa132d517881e0ba2016309696f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -31,10 +31,10 @@ index eb32871..a380e61 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 11824ba..66828f9 100644
+index 1dab67b..23cef2b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1802,6 +1802,33 @@ public abstract class World implements IBlockAccess {
+@@ -1799,6 +1799,33 @@ public abstract class World implements IBlockAccess {
          return this.a(axisalignedbb, (Entity) null);
      }
  
@@ -68,7 +68,7 @@ index 11824ba..66828f9 100644
      public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
          List list = this.getEntities((Entity) null, axisalignedbb);
  
-@@ -2686,7 +2713,7 @@ public abstract class World implements IBlockAccess {
+@@ -2683,7 +2710,7 @@ public abstract class World implements IBlockAccess {
          AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition);
  
          // CraftBukkit start - store default return