Update upstream CB/S

9 files changed, 44 insertions, 44 deletions

diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index 3c47e1453e..7484cfc7bb 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 0504c5dc3eb712b43ba408c346d2a84e752ffc16 Mon Sep 17 00:00:00 2001
+From 8b7c2bb5ec55a8468a4da7ec0f7af9045bb1b514 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -554,7 +554,7 @@ index 11a49a3..e70d5c5 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f96dafc..c35f073 100644
+index 6434566..1409faa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@@ -584,7 +584,7 @@ index f96dafc..c35f073 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().c(d0, d1, d2));
              this.recalcPosition();
-@@ -803,7 +803,6 @@ public abstract class Entity implements ICommandListener {
+@@ -805,7 +805,6 @@ public abstract class Entity implements ICommandListener {
  
              this.world.methodProfiler.b();
          }
@@ -1505,7 +1505,7 @@ index 3a95b44..b5efb9c 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c75538..5874554 100644
+index 4e3b8fc..8ee4fc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1736,5 +1736,5 @@ index 30efc99..eb30abe 100644
      }
  }
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 84badf812e..02afe8f7f3 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From e11d76d146840a3175c0ed3bd4214367883b0079 Mon Sep 17 00:00:00 2001
+From 4bb47c60de037d0bcb5a0714eb4ebe20d1e52f1b Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c35f073..38df1c6 100644
+index 1409faa..cf08a0e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -145,6 +145,7 @@ public abstract class Entity implements ICommandListener {
@@ -16,7 +16,7 @@ index c35f073..38df1c6 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1371,6 +1372,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1373,6 +1374,11 @@ public abstract class Entity implements ICommandListener {
                  }
              }
  
@@ -28,7 +28,7 @@ index c35f073..38df1c6 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1515,6 +1521,13 @@ public abstract class Entity implements ICommandListener {
+@@ -1517,6 +1523,13 @@ public abstract class Entity implements ICommandListener {
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index c35f073..38df1c6 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1536,6 +1549,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1538,6 +1551,7 @@ public abstract class Entity implements ICommandListener {
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
 +    // Paper end
  }
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
index e39def2bb6..49aa34076f 100644
--- a/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 102e4f5e00e09d8d0c5c918d2a4f201736c79130 Mon Sep 17 00:00:00 2001
+From 8e1c1aed3bdd1a33d88a644e3268614744113795 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -37,10 +37,10 @@ index 5f579bc..8e5419d 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 14c2d2c..232ba8e 100644
+index 4e333e0..5a4b5bc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1893,6 +1893,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1895,6 +1895,7 @@ public abstract class Entity implements ICommandListener {
  
      @Nullable
      public ScoreboardTeamBase aQ() {
@@ -49,5 +49,5 @@ index 14c2d2c..232ba8e 100644
      }
  
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
index 90a7b206f1..88c102ab83 100644
--- a/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 26da32e5e28a2611a881625cfb24d7190e337633 Mon Sep 17 00:00:00 2001
+From e856a0daace0996ac8b78b2e5def6660dc416d0b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fab8eb4..1106bd8 100644
+index 91eb036..7696998 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2149,7 +2149,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2151,7 +2151,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
@@ -20,5 +20,5 @@ index fab8eb4..1106bd8 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index d67f6993ac..41514c6362 100644
--- a/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 4bc7f05b857898c95fbb2b0c7d6bee3c1d46d1c0 Mon Sep 17 00:00:00 2001
+From e73783fde0c9d9866da5d5c70a4b9382ce491ded Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -19,10 +19,10 @@ index 84694b2..64e20d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1106bd8..a17355c 100644
+index 7696998..966f9fd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1892,6 +1892,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1894,6 +1894,7 @@ public abstract class Entity implements ICommandListener {
          return this.getFlag(5);
      }
  
@@ -51,5 +51,5 @@ index cad016a..df6cb13 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
index f6634c1619..557ccfa95b 100644
--- a/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
@@ -1,14 +1,14 @@
-From 7833d4c0dbdc60825c22eed518768eef034531d4 Mon Sep 17 00:00:00 2001
+From 4bd6e01e211901f94be1376c9311fb394a931e63 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 66337e4..afbc204 100644
+index 5f134d0..6950acf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1698,6 +1698,10 @@ public abstract class Entity implements ICommandListener {
+@@ -1700,6 +1700,10 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean a(Entity entity, boolean flag) {
@@ -19,7 +19,7 @@ index 66337e4..afbc204 100644
          if (!flag && (!this.n(entity) || !entity.q(this))) {
              return false;
          } else {
-@@ -1706,7 +1710,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1708,7 +1712,7 @@ public abstract class Entity implements ICommandListener {
              }
  
              this.au = entity;
@@ -28,7 +28,7 @@ index 66337e4..afbc204 100644
              return true;
          }
      }
-@@ -1733,12 +1737,20 @@ public abstract class Entity implements ICommandListener {
+@@ -1735,12 +1739,20 @@ public abstract class Entity implements ICommandListener {
      }
  
      protected void o(Entity entity) {
@@ -49,7 +49,7 @@ index 66337e4..afbc204 100644
              CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
              Entity orig = craft == null ? null : craft.getHandle();
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
-@@ -1761,6 +1773,8 @@ public abstract class Entity implements ICommandListener {
+@@ -1763,6 +1775,8 @@ public abstract class Entity implements ICommandListener {
                  return;
              }
              // Spigot end
@@ -58,7 +58,7 @@ index 66337e4..afbc204 100644
              if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
                  this.passengers.add(0, entity);
              } else {
-@@ -1786,16 +1800,29 @@ public abstract class Entity implements ICommandListener {
+@@ -1788,16 +1802,29 @@ public abstract class Entity implements ICommandListener {
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
                  Entity n = craftn == null ? null : craftn.getHandle();
                  if (event.isCancelled() || n != orig) {
@@ -90,5 +90,5 @@ index 66337e4..afbc204 100644
          return this.bx().size() < 1;
      }
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
index a2430df609..cba18fb218 100644
--- a/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From 447be950266364ba6f54a3a5544b7ceef4c8838a Mon Sep 17 00:00:00 2001
+From 97eadebda44f3490ac37b185007ca725234a701e Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional old TNT cannon behaviors
@@ -191,7 +191,7 @@ index bfb27ed..b1ba434 100644
                  world.addEntity(entitytntprimed);
                  world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
-index 03ce337..588c0e9 100644
+index 61735bb..41bd6e5 100644
 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java
 +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
 @@ -497,7 +497,11 @@ public class DispenserRegistry {
@@ -208,10 +208,10 @@ index 03ce337..588c0e9 100644
                     world.getServer().getPluginManager().callEvent(event);
                  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 059042e..7fc3e57 100644
+index bade448..a67c212 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -978,6 +978,12 @@ public abstract class Entity implements ICommandListener {
+@@ -980,6 +980,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean ak() {
@@ -224,7 +224,7 @@ index 059042e..7fc3e57 100644
          if (this.bB() instanceof EntityBoat) {
              this.inWater = false;
          } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
-@@ -1179,6 +1185,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1181,6 +1187,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public double f(double d0, double d1, double d2) {
@@ -237,7 +237,7 @@ index 059042e..7fc3e57 100644
          double d3 = this.locX - d0;
          double d4 = this.locY - d1;
          double d5 = this.locZ - d2;
-@@ -1233,6 +1245,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1235,6 +1247,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public void g(double d0, double d1, double d2) {
@@ -250,7 +250,7 @@ index 059042e..7fc3e57 100644
          this.motX += d0;
          this.motY += d1;
          this.motZ += d2;
-@@ -2358,6 +2376,12 @@ public abstract class Entity implements ICommandListener {
+@@ -2360,6 +2378,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean bg() {
@@ -391,5 +391,5 @@ index 6cdc3a3..0b9bc91 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.10.0.windows.1
+2.10.1.windows.1
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 744e1a177a0c98a7690e72a640d6993c12ae456
+Subproject b5fb9a1cd769a0ee1283c47b5b8b54bbf559c9a
diff --git a/work/Spigot b/work/Spigot
-Subproject 047f737bbf62d3a396c317a58fd9b4034603ee0
+Subproject 850da7e0741c8af9a852d495092dc9824916295