Update from upstream SpigotMC

f234263c871
9f2d587b97e
6d85d979798
24ca434ad3c
5ffe41c3910
13716d9d5ee

CraftBukkit-Patches/0012-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 8bc2807db8521c8404f0beedd2f222fea6cb7692 Mon Sep 17 00:00:00 2001
+From 9c1350d6fd67ca5822326b458b156d13167269e2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -6,10 +6,10 @@ Subject: [PATCH] Spigot Timings
 Overhauls the Timings System adding performance tracking all around the Minecraft Server
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4ac212b..7519bfa 100644
+index bf48742..867caca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -876,6 +876,7 @@ public class Chunk {
+@@ -864,6 +864,7 @@ public class Chunk {
      }
  
      public void loadNearby(IChunkProvider ichunkprovider, IChunkProvider ichunkprovider1, int i, int j) {
@@ -17,7 +17,7 @@ index 4ac212b..7519bfa 100644
          boolean flag = ichunkprovider.isChunkLoaded(i, j - 1);
          boolean flag1 = ichunkprovider.isChunkLoaded(i + 1, j);
          boolean flag2 = ichunkprovider.isChunkLoaded(i, j + 1);
-@@ -922,6 +923,7 @@ public class Chunk {
+@@ -910,6 +911,7 @@ public class Chunk {
              }
          }
  
@@ -133,7 +133,7 @@ index 424b71d..390c6eb 100644
  
      public boolean ad() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7bec05f..5441e8b 100644
+index 317eaf3..3577d1f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -16,6 +16,7 @@ import org.bukkit.entity.Hanging;

CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From c8dd6cac7c41eaa7c7abc6fbf8aebe3e6b521ef7 Mon Sep 17 00:00:00 2001
+From e7f6cff0b4ca05814f3d4bbb173e748ba30abce2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -8,7 +8,7 @@ Changes the mob spawning algorithm to properly account for view distance and the
 Needs better documentation.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7519bfa..c3059b6 100644
+index 867caca..9e65ff7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -42,6 +42,7 @@ public class Chunk {
@@ -19,7 +19,7 @@ index 7519bfa..c3059b6 100644
  
      // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
      private int neighbors = 0x1 << 12;
-@@ -662,6 +663,22 @@ public class Chunk {
+@@ -650,6 +651,22 @@ public class Chunk {
          entity.af = k;
          entity.ag = this.locZ;
          this.entitySlices[k].add(entity);
@@ -42,7 +42,7 @@ index 7519bfa..c3059b6 100644
      }
  
      public void b(Entity entity) {
-@@ -678,6 +695,22 @@ public class Chunk {
+@@ -666,6 +683,22 @@ public class Chunk {
          }
  
          this.entitySlices[i].remove(entity);

CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,14 +1,14 @@
-From 04adfc1b8e240bc913d03900406ba4d745a1dea7 Mon Sep 17 00:00:00 2001
+From c03487c3efd1843fe1e6f73a6a82c3753f3a7753 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c3059b6..9e9ea23 100644
+index 9e65ff7..2e715b3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -994,7 +994,7 @@ public class Chunk {
+@@ -982,7 +982,7 @@ public class Chunk {
          }
  
          this.p = true;

CraftBukkit-Patches/0032-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From 1b9e109bcbc78ceb77bbee74f18fa82d01d2710f Mon Sep 17 00:00:00 2001
+From 0131eb77a3156db559cca4e0592c695665ae9276 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9e9ea23..208ba6b 100644
+index 2e715b3..49eab04 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -808,6 +808,18 @@ public class Chunk {
+@@ -796,6 +796,18 @@ public class Chunk {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -28,7 +28,7 @@ index 9e9ea23..208ba6b 100644
  
              this.world.b(tileentity);
          }
-@@ -818,6 +830,18 @@ public class Chunk {
+@@ -806,6 +818,18 @@ public class Chunk {
              java.util.Iterator<Entity> iter = newList.iterator();
              while (iter.hasNext()) {
                  Entity entity = iter.next();

CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch

@@ -1,14 +1,14 @@
-From bade81a132af349e6b68ce2754a8819afdaa76b6 Mon Sep 17 00:00:00 2001
+From 32611dcf3944f116ddebd3dd2dafb1c9ca15825e Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 208ba6b..e664e55 100644
+index 49eab04..372d90f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1036,7 +1036,15 @@ public class Chunk {
+@@ -1024,7 +1024,15 @@ public class Chunk {
      }
  
      public boolean isReady() {

CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch

@@ -1,4 +1,4 @@
-From 3d1a1a063bb073fe32197cd248e2c99a91e22c48 Mon Sep 17 00:00:00 2001
+From f561bf612ad74726ef06ecff673d87207a3b12da Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Improve AutoSave Mechanism
@@ -11,10 +11,10 @@ Instead we will mimic the save-all command in its behaviour, which is both safe
 Also, only save modified chunks, or chunks with entities after 4 auto save passes
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e664e55..1412616 100644
+index 372d90f..c0e2a50 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -917,7 +917,7 @@ public class Chunk {
+@@ -905,7 +905,7 @@ public class Chunk {
              if (this.r && this.world.getTime() != this.lastSaved || this.q) {
                  return true;
              }

CraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch

@@ -1,4 +1,4 @@
-From 3d0358de49670c0b353cfebf7c6270252358d265 Mon Sep 17 00:00:00 2001
+From eebb1f4a78667f6b44b50294d4f95ddb0e33db4c Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Sat, 19 Apr 2014 16:58:26 -0400
 Subject: [PATCH] Alternative Hopper Ticking
@@ -45,10 +45,10 @@ index cc3e340..9a6ecbb 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1412616..9d52a3d 100644
+index c0e2a50..c50ab45 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -763,6 +763,11 @@ public class Chunk {
+@@ -751,6 +751,11 @@ public class Chunk {
  
              tileentity.D();
              this.tileEntities.put(blockposition, tileentity);

CraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch

@@ -1,4 +1,4 @@
-From b6ae7c30e85baea6136474c710927d1b61cdab09 Mon Sep 17 00:00:00 2001
+From 76dc2a8f7cd18460f40c03c0c3f750a23d2775b0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 21 Sep 2014 10:06:01 +1000
 Subject: [PATCH] Fix Some Memory Leaks
@@ -33,7 +33,7 @@ index c624190..d617228 100644
  
      public static int a(EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 02eed74..bc7f81e 100644
+index 5ef61d9..214c0ca 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1,5 +1,6 @@
@@ -45,8 +45,8 @@ index 02eed74..bc7f81e 100644
  import java.util.UUID;
 @@ -24,7 +25,7 @@ public abstract class EntityInsentient extends EntityLiving {
      protected NavigationAbstract navigation;
-     protected final PathfinderGoalSelector goalSelector;
+     public PathfinderGoalSelector goalSelector; // PAIL protected final to public
-     protected final PathfinderGoalSelector targetSelector;
+     public PathfinderGoalSelector targetSelector; // PAIL protected final to public
 -    private EntityLiving goalTarget;
 +    private WeakReference<EntityLiving> goalTarget = new WeakReference<EntityLiving>(null);
      private EntitySenses bi;