Update upstream B/CB/S

PaperMC · Jan 20, 2017 · c1641b8 · c1641b8
1 parent 099b85f
commit c1641b8
Show file tree

Hide file tree

Showing 93 changed files with 177 additions and 226 deletions.
diff --git a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
@@ -1,16 +1,16 @@
-From e66a13a63d87c0064d5ae21c8c5215f2d2433212 Mon Sep 17 00:00:00 2001
+From 17223e9ba60ecfb981e037bcc62018b428d71808 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index e7a32f7..08095b9 100644
+index 1ff0951..da4678d 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -40,6 +40,31 @@ public interface Arrow extends Projectile {
-      */
-     public void setCritical(boolean critical);
+@@ -72,6 +72,40 @@ public interface Arrow extends Projectile {
+         CREATIVE_ONLY
+     }
 
 +    // Paper start
 +    /**
@@ -20,16 +20,25 @@ index e7a32f7..08095b9 100644
 +     * <b>not</b> fired from a bow with the infinity enchantment.</p>
 +     *
 +     * @return The pickup rule
++     * @deprecated Use {@link Arrow#getPickupStatus()} as an upstream compatible replacement for this function
 +     */
-+    PickupRule getPickupRule();
++    @Deprecated
++    default PickupRule getPickupRule() {
++        return PickupRule.valueOf(this.getPickupStatus().name());
++    }
 +
 +    /**
 +     * Set the rule for which players can pickup this arrow as an item.
 +     *
 +     * @param rule The pickup rule
++     * @deprecated Use {@link Arrow#setPickupStatus(PickupStatus)} with {@link PickupStatus} as an upstream compatible replacement for this function
 +     */
-+    void setPickupRule(PickupRule rule);
++    @Deprecated
++    default void setPickupRule(PickupRule rule) {
++        this.setPickupStatus(PickupStatus.valueOf(rule.name()));
++    }
 +
++    @Deprecated
 +    enum PickupRule {
 +        DISALLOWED,
 +        ALLOWED,

diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From f12d4e4b4091d002eeedd603a8f2ea637c5f734a Mon Sep 17 00:00:00 2001
+From 389912ff339c2edd5542e66afc749c588f15fe04 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
@@ -586,7 +586,7 @@ index cb83e4f..4dab9e9 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 dd946b9..4d28933 100644
+index e7b1ebb..05312c6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@@ -625,7 +625,7 @@ index dd946b9..4d28933 100644
 
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b231bfe..4fbe92a 100644
+index 318d57e..955e1f7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -969,7 +969,7 @@ index a5a096b..c546139 100644
 
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 027baa6..04b4980 100644
+index dc630c5..1248613 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1017,7 +1017,7 @@ index 027baa6..04b4980 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7be0135..9f52995 100644
+index c0af82b..676cc3f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -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 09ca809..47e3b4d 100644
+index b29375a..c2326cd 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;
@@ -1209,10 +1209,10 @@ index 09ca809..47e3b4d 100644
      }
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4713150..26627ce 100644
+index 391a09c..9669389 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
 
          timings.doChunkUnload.stopTiming(); // Spigot
          this.methodProfiler.c("tickPending");
@@ -1230,7 +1230,7 @@ index 4713150..26627ce 100644
          this.methodProfiler.c("chunkMap");
          timings.doChunkMap.startTiming(); // Spigot
          this.manager.flush();
-@@ -468,7 +468,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -469,7 +469,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      }
                  }
 
@@ -1239,23 +1239,23 @@ index 4713150..26627ce 100644
                  if (i > 0) {
                      ChunkSection[] achunksection = chunk.getSections();
                      int i1 = achunksection.length;
-@@ -496,6 +496,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -497,6 +497,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                          }
                      }
                  }
 +                timings.chunkTicksBlocks.stopTiming(); // Paper
              }
 
              this.methodProfiler.b();
-@@ -691,6 +692,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -692,6 +693,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
 
                  this.methodProfiler.a("cleaning");
 
 +                timings.scheduledBlocksCleanup.startTiming(); // Paper
                  NextTickListEntry nextticklistentry;
 
                  for (int j = 0; j < i; ++j) {
-@@ -704,9 +706,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -705,9 +707,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      // this.nextTickListHash.remove(nextticklistentry);
                      this.U.add(nextticklistentry);
                  }
@@ -1267,7 +1267,7 @@ index 4713150..26627ce 100644
                  Iterator iterator = this.U.iterator();
 
                  while (iterator.hasNext()) {
-@@ -716,6 +720,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -717,6 +721,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
 
                      if (this.areChunksLoadedBetween(nextticklistentry.a.a(0, 0, 0), nextticklistentry.a.a(0, 0, 0))) {
                          IBlockData iblockdata = this.getType(nextticklistentry.a);
@@ -1276,7 +1276,7 @@ index 4713150..26627ce 100644
 
                          if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
                              try {
-@@ -728,10 +734,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -729,10 +735,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                                  throw new ReportedException(crashreport);
                              }
                          }
@@ -1289,7 +1289,7 @@ index 4713150..26627ce 100644
 
                  this.methodProfiler.b();
                  this.U.clear();
-@@ -827,7 +835,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -828,7 +836,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed());
          }
 
@@ -1298,15 +1298,15 @@ index 4713150..26627ce 100644
          // CraftBukkit end
      }
 
-@@ -992,6 +1000,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -993,6 +1001,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
 
          if (chunkproviderserver.e()) {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
 +            timings.worldSave.startTiming(); // Paper
              if (iprogressupdate != null) {
                  iprogressupdate.a("Saving level");
              }
-@@ -1001,7 +1010,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1002,7 +1011,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  iprogressupdate.c("Saving chunks");
              }
 
@@ -1316,7 +1316,7 @@ index 4713150..26627ce 100644
              // CraftBukkit - ArrayList -> Collection
              Collection arraylist = chunkproviderserver.a();
              Iterator iterator = arraylist.iterator();
-@@ -1013,7 +1024,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1014,7 +1025,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      chunkproviderserver.unload(chunk);
                  }
              }
@@ -1325,15 +1325,15 @@ index 4713150..26627ce 100644
          }
      }
 
-@@ -1026,6 +1037,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1027,6 +1038,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
      }
 
      protected void a() throws ExceptionWorldConflict {
 +        timings.worldSaveLevel.startTiming(); // Paper
          this.checkSession();
          WorldServer[] aworldserver = this.server.worldServer;
          int i = aworldserver.length;
-@@ -1055,6 +1067,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1056,6 +1068,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
          this.worldData.e(this.getWorldBorder().i());
          this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t());
          this.worldMaps.a();

diff --git a/Spigot-Server-Patches/0038-Disable-thunder.patch b/Spigot-Server-Patches/0038-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From b5b06750f1956bfa1a74efeaa6f68bcc0e0b26b5 Mon Sep 17 00:00:00 2001
+From 50c55198f8c72c73029453ba0bcb0e1cd828fe73 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -19,10 +19,10 @@ index fcbf8a2..b52e5c5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2817191..c4f0e68 100644
+index 9669389..ce087eb 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -427,7 +427,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -428,7 +428,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  int l;
                  BlockPosition blockposition;
 

diff --git a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From 524b919f7729b5f39111e2ff26f2aab3c43e46c3 Mon Sep 17 00:00:00 2001
+From 3f4a3864863d7b9d51a39ef674285fcf1a2696e1 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -19,10 +19,10 @@ index b52e5c5..a6afdd3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c4f0e68..52b70e7 100644
+index ce087eb..ac8dc5f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -450,7 +450,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -451,7 +451,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  }
 
                  this.methodProfiler.c("iceandsnow");

diff --git a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 1f1a23cdb676e0278f516e3a4cde83467aa54a07 Mon Sep 17 00:00:00 2001
+From 953598e8f144a0fe01042ac29cfe4a9b5e914616 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 1bc7338..ac10fec 100644
+index e16a4d2..a853156 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2265,7 +2265,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2268,7 +2268,7 @@ public abstract class Entity implements ICommandListener {
      }
 
      public Entity teleportTo(Location exit, boolean portal) {

diff --git a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From f956cdf7c0c12d09a95d78745f88a0a884771142 Mon Sep 17 00:00:00 2001
+From 4d062dbe2088771c29d59322d7386cc77d045b5a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -19,10 +19,10 @@ index 9cce672..d92ccc7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 696f659..564ef79 100644
+index ac8dc5f..39ed0d5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -436,7 +436,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      if (this.isRainingAt(blockposition)) {
                          DifficultyDamageScaler difficultydamagescaler = this.D(blockposition);
 

diff --git a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 982998dd8173683b1421ad89314de7661077d332 Mon Sep 17 00:00:00 2001
+From 891b22e04fed34d3d01c8c5d7c0aabbe21bef5eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bfb30d9..1f12ff5 100644
+index df48212..3715438 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index bfb30d9..1f12ff5 100644
                      this.getServer().getPluginManager().callEvent(event);
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 564ef79..5bf7df7 100644
+index 39ed0d5..f969d2a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -49,15 +49,15 @@ index 564ef79..5bf7df7 100644
      private final MinecraftServer server;
      public EntityTracker tracker;
      private final PlayerChunkMap manager;
-@@ -726,6 +727,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -727,6 +728,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
 
                          if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
                              try {
 +                                stopPhysicsEvent = !paperConfig.firePhysicsEventForRedstone && (iblockdata.getBlock() instanceof BlockDiodeAbstract || iblockdata.getBlock() instanceof BlockRedstoneTorch); // Paper
                                  iblockdata.getBlock().b((World) this, nextticklistentry.a, iblockdata, this.random);
                              } catch (Throwable throwable) {
                                  CrashReport crashreport = CrashReport.a(throwable, "Exception while ticking a block");
-@@ -733,7 +735,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -734,7 +736,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
 
                                  CrashReportSystemDetails.a(crashreportsystemdetails, nextticklistentry.a, iblockdata);
                                  throw new ReportedException(crashreport);

diff --git a/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch