Merge pull request #718 from electronicboy/pre/1.12

Update Paper to MC 1.12
2024-11-23 19:15:32 +01:00 · 2017-06-08 09:37:29 -05:00 · 2017-06-08 09:37:29 -05:00 · 77cb896d51
commit 77cb896d51
parent bd34f2060d 3c9f2a0a20
22 changed files with 117 additions and 129 deletions
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@ -1,11 +1,11 @@
-From c40d302beea8a6ad8805ddf604afe2aed7552b9c Mon Sep 17 00:00:00 2001
+From b106ae7ff8bc4c4cefd1e34a6c8447a9f03d8614 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:16:08 -0600
 Subject: [PATCH] POM changes


 diff --git a/pom.xml b/pom.xml
-index df62fbd8..31991487 100644
+index cad55895..869be1b5 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -4,35 +4,36 @@
@ -24,7 +24,7 @@ index df62fbd8..31991487 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.12-pre6-SNAPSHOT</version>
+     <version>1.12-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Spigot-API</name>
@ -132,5 +132,5 @@ index df62fbd8..31991487 100644
                     <shadedArtifactAttached>true</shadedArtifactAttached>
                 </configuration>
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@ -1,11 +1,11 @@
-From ede9fd5f7e5e6b8d0a3069fa2568782e553502bd Mon Sep 17 00:00:00 2001
+From 3960b77a1b0f1bf81f46f96395a983b476460a1d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes


 diff --git a/pom.xml b/pom.xml
-index ed0ddbd86..fce7fe4d0 100644
+index d677e79df..78395669f 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -1,12 +1,12 @@
@ -17,7 +17,7 @@ index ed0ddbd86..fce7fe4d0 100644
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper</artifactId>
     <packaging>jar</packaging>
-     <version>1.12-pre6-SNAPSHOT</version>
+     <version>1.12-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>Paper</name>
@ -159,5 +159,5 @@ index 93046379d..674096cab 100644
 
         if (stream != null) {
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@ -1,11 +1,11 @@
-From eaf49214e8b2bffc9e6aeb7890b660b23d5d9baf Mon Sep 17 00:00:00 2001
+From 1dcc85c66e450b5212e23981c7b8e5a381f66dfc 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


 diff --git a/pom.xml b/pom.xml
-index fce7fe4d0..ad910df98 100644
+index 78395669f..39ca6aede 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -65,6 +65,12 @@
@ -441,7 +441,7 @@ index 5ab2cf6ee..b5795b6d3 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 4cb71b294..ec406644c 100644
+index 7501a1a28..1701804b1 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -35,6 +35,15 @@ public class Block {
@ -461,7 +461,7 @@ index 4cb71b294..ec406644c 100644
     public static int getId(Block block) {
         return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7fee74d80..39ad8d691 100644
+index d268fec39..52f6242d7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -900,7 +900,7 @@ public class Chunk {
@ -531,7 +531,7 @@ index 9dcab42de..c1b0d6cea 100644
             this.chunkLoader.a(this.world, chunk);
         } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 80a5b2013..403a2cb2e 100644
+index a4fca0ca9..161ea8172 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -388,7 +388,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -571,7 +571,7 @@ index 80a5b2013..403a2cb2e 100644
         // return chunk; // CraftBukkit
     }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 6abbc3bc3..11f62b9b9 100644
+index 7fe2796fe..2feeb855b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -24,7 +24,7 @@ import java.io.PrintStream;
@ -624,7 +624,7 @@ index 6abbc3bc3..11f62b9b9 100644
             return waitable.get();
         } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0138ac4ab..5d47bc459 100644
+index da1598a24..2facde681 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;
@ -663,7 +663,7 @@ index 0138ac4ab..5d47bc459 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 cb483dc2a..9e31db26d 100644
+index bc2da3316..f446020af 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;
@ -681,7 +681,7 @@ index cb483dc2a..9e31db26d 100644
     public void B_() {
 -        SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot
         super.B_();
-         this.cG();
+         this.cI();
         if (!this.world.isClientSide) {
@@ -1934,9 +1933,7 @@ public abstract class EntityLiving extends Entity {
             }
@ -728,13 +728,13 @@ index cb483dc2a..9e31db26d 100644
         this.world.methodProfiler.b();
         this.world.methodProfiler.a("push");
 -        SpigotTimings.timerEntityAICollision.startTiming(); // Spigot
-         this.cz();
+         this.cB();
 -        SpigotTimings.timerEntityAICollision.stopTiming(); // Spigot
         this.world.methodProfiler.b();
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index c840f6761..14504cbcc 100644
+index 284d1204d..3aab54206 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -175,7 +175,7 @@ public class EntityTracker {
@ -765,7 +765,7 @@ index c840f6761..14504cbcc 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3961a5fe6..8dbbab3ad 100644
+index e396b3822..43b4e552b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -47,8 +47,8 @@ import org.bukkit.Bukkit;
@ -1012,7 +1012,7 @@ index eeac34998..e4ed2e991 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1bcf74400..4c08373ba 100644
+index ddd36a3c6..42b05bee8 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;
@ -1090,7 +1090,7 @@ index f74b06794..1fc632e0c 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 4798dd4f5..acdc68c8f 100644
+index 788e0e1b5..b7ebbc9ff 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1176,7 +1176,7 @@ index 591f4ad7f..e02f0c442 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 17255e2d5..e51a288a8 100644
+index d16e499ae..aced20e3b 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;
@ -1270,7 +1270,7 @@ index 17255e2d5..e51a288a8 100644
             ++entity.ticksLived;
 +            ++co.aikar.timings.TimingHistory.activatedEntityTicks; // Paper
             if (entity.isPassenger()) {
-                 entity.aC();
+                 entity.aE();
             } else {
@@ -1694,8 +1699,6 @@ public abstract class World implements IBlockAccess {
                 }
@ -1282,7 +1282,7 @@ index 17255e2d5..e51a288a8 100644
 
     public boolean b(AxisAlignedBB axisalignedbb) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b924dad97..63c7d4402 100644
+index bbbbae49b..5835553b5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -256,13 +256,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -1677,7 +1677,7 @@ index 3a95b4465..b5efb9c3f 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 c019e5229..d10177669 100644
+index 001b6040f..d4c8fafe7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1689,7 +1689,7 @@ index c019e5229..d10177669 100644
 import org.bukkit.craftbukkit.block.CraftSign;
 import org.bukkit.craftbukkit.conversations.ConversationTracker;
 import org.bukkit.craftbukkit.CraftEffect;
-@@ -1591,6 +1591,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1595,6 +1595,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             packet.components = components;
             getHandle().playerConnection.sendPacket(packet);
         }
@ -1873,7 +1873,7 @@ index e52ef47b7..3d90b3426 100644
         this.value = value;
     }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index be23631b2..9eb36f3e9 100644
+index 2bd690fdf..38be7ed71 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@ -1935,5 +1935,5 @@ index be23631b2..9eb36f3e9 100644
     }
 }
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
@ -1,15 +1,15 @@
-From 1370c5a99e145e2ec03f3b39b3d3498b36184a4f Mon Sep 17 00:00:00 2001
+From 46e9f8769e155aa2e047d3f373c816b6880243f3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data


 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index ba124665f..7eaa8d511 100644
+index b69c6cf97..eba1228fd 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
-             File file = new File(this.playerDir, entityhuman.bl() + ".dat");
+             File file = new File(this.playerDir, entityhuman.bn() + ".dat");
             // Spigot Start
             boolean usingWrongFile = false;
 -            if ( !file.exists() )
@ -18,5 +18,5 @@ index ba124665f..7eaa8d511 100644
                 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                 if ( file.exists() )
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
@ -1,4 +1,4 @@
-From 7197a213cc0ee3f96c122d16a7f3c9fc46cc75d6 Mon Sep 17 00:00:00 2001
+From add952595402a6d97bde481631fb6ddca700c3f1 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@ -19,7 +19,7 @@ index a197af84f..2217f680c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c9bf14d77..64876f134 100644
+index f446020af..6b9b55020 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -900,6 +900,7 @@ public abstract class EntityLiving extends Entity {
@ -46,9 +46,9 @@ index c9bf14d77..64876f134 100644
 +
                 if (this.getHealth() <= 0.0F) {
                     if (!this.e(damagesource)) {
-                         SoundEffect soundeffect = this.cd();
+                         SoundEffect soundeffect = this.cf();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 63b70d60c..0d434544d 100644
+index e7f0e84d4..e148901e5 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -146,7 +146,7 @@ public class Explosion {
@ -70,5 +70,5 @@ index 63b70d60c..0d434544d 100644
                             }
                         }
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
@ -1,4 +1,4 @@
-From fe118acf4eb8ef1aa3a14ff4679bbec755960ec7 Mon Sep 17 00:00:00 2001
+From d6447f966a098b3fc6e8d537225d43e98069cd34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@ -25,7 +25,7 @@ index fa49397ea..9987a5c7a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index 06523f683..00a34e85a 100644
+index ec9a87239..b08274d93 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
@@ -492,6 +492,7 @@ public class CommandScoreboard extends CommandAbstract {
@ -33,21 +33,21 @@ index 06523f683..00a34e85a 100644
                     while (iterator.hasNext()) {
                         Entity entity = (Entity) iterator.next();
 +                        if (!entity.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(entity instanceof EntityHuman)) { continue; } // Paper
-                         String s2 = f(minecraftserver, icommandlistener, entity.bl());
+                         String s2 = f(minecraftserver, icommandlistener, entity.bn());
 
                         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 e9a7565ae..dbaf2863b 100644
+index b4f42a71d..e78b3789f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2074,6 +2074,7 @@ public abstract class Entity implements ICommandListener {
 
     @Nullable
-     public ScoreboardTeamBase aW() {
+     public ScoreboardTeamBase aY() {
 +        if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
-         return this.world.getScoreboard().getPlayerTeam(this.bl());
+         return this.world.getScoreboard().getPlayerTeam(this.bn());
     }
 
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0071-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0071-Undead-horse-leashing.patch
@ -1,4 +1,4 @@
-From 0b2c23e0f9ef9496c70ffc151913ad91f1fd1cfe Mon Sep 17 00:00:00 2001
+From 13fc523d37a56bf1c6e29656573d3c647df3b68a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@ -20,7 +20,7 @@ index 9987a5c7a..0873febb6 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index bed01b8c0..a3c41130f 100644
+index 46d1ea217..dcc39236f 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@ -31,7 +31,7 @@ index bed01b8c0..a3c41130f 100644
 +        return world.paperConfig.allowLeashingUndeadHorse ? super.a(entityhuman) : super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD; // Paper
     }
 
-     protected void s(float f) {
+     protected void q(float f) {
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
@ -1,11 +1,11 @@
-From 8d2c7044a378483beaf90ef87cbd0ecdb5f92215 Mon Sep 17 00:00:00 2001
+From 470c1176b532ba1eb828a2a1152d1ac2402c879e Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1ad33521c..2b20a0205 100644
+index 6b9b55020..fe9cd7769 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2369,12 +2369,13 @@ public abstract class EntityLiving extends Entity {
@ -34,9 +34,9 @@ index 1ad33521c..2b20a0205 100644
 +            }
 +            // Paper end
 +
-             this.a(this.cF(), itemstack);
+             this.a(this.cH(), itemstack);
             // CraftBukkit end
-             this.cL();
+             this.cN();
 +
 +            // Paper start - if the replacement is anything but the default, update the client inventory
 +            if (this instanceof EntityPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
@ -46,5 +46,5 @@ index 1ad33521c..2b20a0205 100644
 
     }
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@ -1,4 +1,4 @@
-From 78d09b01059f7df6a117d4020bf8633f8cbdaaa2 Mon Sep 17 00:00:00 2001
+From a82b7c5ccebec5ba3024bb82d07253ed95c6041a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@ -19,19 +19,19 @@ index 3a942c763..3bd29650c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9a47d00c0..f6d04c3d5 100644
+index ed8c72300..468d64316 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2073,6 +2073,7 @@ public abstract class Entity implements ICommandListener {
         return this.getFlag(5);
     }
 
-+    @Nullable public ScoreboardTeamBase getTeam() { return this.aW(); } // Paper - OBFHELPER
+    @Nullable public ScoreboardTeamBase getTeam() { return this.aY(); } // Paper - OBFHELPER
     @Nullable
-     public ScoreboardTeamBase aW() {
+     public ScoreboardTeamBase aY() {
         if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e20a166b7..76784a3af 100644
+index 4c90d1d40..75f43f420 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1378,7 +1378,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -51,5 +51,5 @@ index e20a166b7..76784a3af 100644
                 if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                     for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch
@ -1,4 +1,4 @@
-From 33ffb467efb9f278427de2cda44177f8668cbaf2 Mon Sep 17 00:00:00 2001
+From 0e76f067787f47458049e16499ba476dbac629e5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
@ -32,7 +32,7 @@ index fbe769eb3..d2a542354 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 094891057..5cd82f1b2 100644
+index 14b6439c2..724e85aa3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1108,6 +1108,11 @@ public abstract class Entity implements ICommandListener {
@ -44,13 +44,13 @@ index 094891057..5cd82f1b2 100644
 +
 +    public boolean doWaterMovement() {
 +        // Paper end
-         if (this.bH() instanceof EntityBoat) {
+         if (this.bJ() 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)) {
@@ -2532,6 +2537,11 @@ public abstract class Entity implements ICommandListener {
     }
 
-     public boolean bm() {
+     public boolean bo() {
 +        return this.pushedByWater();
 +    }
 +
@ -114,5 +114,5 @@ index bb0904f86..50811852a 100644
 +    // Paper end
 }
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch
@ -1,4 +1,4 @@
-From b44a6c7ed51c15e5a7ef671cbe747dc68953d5e4 Mon Sep 17 00:00:00 2001
+From 0fbd99c5821b76cd1a7ec33967dd80f3caa8c9d4 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@ -21,13 +21,13 @@ index ef60c15bd..cec9ea74c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9587704d7..97b498507 100644
+index 3d1897d6f..e50f7a3ca 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1731,6 +1731,7 @@ public abstract class EntityLiving extends Entity {
                     this.motY = 0.30000001192092896D;
                 }
-             } else if (this.cN()) {
+             } else if (this.cP()) {
 +                if (world.paperConfig.elytraHitWallDamage) { // Paper start - Toggleable Elytra Wall Damage
                 if (this.motY > -0.5D) {
                     this.fallDistance = 1.0F;
@ -41,5 +41,5 @@ index 9587704d7..97b498507 100644
                 if (this.onGround && !this.world.isClientSide) {
                     if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch
@ -1,4 +1,4 @@
-From 5853695491a09dde341b26e3dcec2a64d2c63d98 Mon Sep 17 00:00:00 2001
+From 4dac185846e96a86266a1a4bdca819c96d9511c5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state

 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 911f527f8..0d73e41f2 100644
+index 44f0d8831..6b5b5e912 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -508,7 +508,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -18,10 +18,10 @@ index 911f527f8..0d73e41f2 100644
 -        if (world.addEntity(entity, reason) && entity.isVehicle()) {
 +        if (!entity.valid && world.addEntity(entity, reason) && entity.isVehicle()) { // Paper
             // CraftBukkit end
-             Iterator iterator = entity.bD().iterator();
+             Iterator iterator = entity.bF().iterator();
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 634f1c28c..0a473d7d2 100644
+index a44bc499a..2cdac0ebc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1101,6 +1101,7 @@ public abstract class World implements IBlockAccess {
@ -33,5 +33,5 @@ index 634f1c28c..0a473d7d2 100644
         int i = MathHelper.floor(entity.locX / 16.0D);
         int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch
@ -1,4 +1,4 @@
-From d5e43c8b2417c55528ab097c6171de59ee530bb6 Mon Sep 17 00:00:00 2001
+From 903515972f2912d705c9c666fd047c7ebb9d9051 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
@ -21,7 +21,7 @@ index 2001175bf..621c585e7 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c5e89997e..94953307b 100644
+index e2dce0ec2..2df4e5a4b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -143,7 +143,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -34,7 +34,7 @@ index c5e89997e..94953307b 100644
             }
         } else {
@@ -162,7 +162,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-             if (this.D && this.player.getVehicle().bC() == this.player) {
+             if (this.D && this.player.getVehicle().bE() == this.player) {
                 if (++this.E > 80) {
                     PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName());
 -                    this.disconnect(new ChatMessage("multiplayer.disconnect.flying", new Object[0]));
@ -43,5 +43,5 @@ index c5e89997e..94953307b 100644
                 }
             } else {
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,11 +1,11 @@
-From 4b4bb09347b4f7639d596d2fa23dfe526741782b Mon Sep 17 00:00:00 2001
+From b3bf4dc6b952d807ac0ae038eb7558a004f55df1 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 0ea60d125..091c96411 100644
+index 7901c0492..709c0150f 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@ -17,7 +17,7 @@ index 0ea60d125..091c96411 100644
     public EntityArmorStand(World world) {
         super(world);
@@ -762,4 +763,13 @@ public class EntityArmorStand extends EntityLiving {
-     public boolean cQ() {
+     public boolean cS() {
         return false;
     }
 +
@ -50,5 +50,5 @@ index 2b66a08ad..8a06cb165 100644
 +    }
 }
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0189-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0189-Activation-Range-Improvements.patch
@ -1,4 +1,4 @@
-From 68cdac4d3d6d018abe0cb1a307181b998c784acb Mon Sep 17 00:00:00 2001
+From d8c5a6c314c708f8018f59df2ba4ad4d34a94626 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior

 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 653aba2ba..6f18bd75b 100644
+index 0c82c6f5b..9659a45ef 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
@@ -10,6 +10,7 @@ public abstract class EntityCreature extends EntityInsentient {
@ -18,7 +18,7 @@ index 653aba2ba..6f18bd75b 100644
     private float b;
     private final float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9bfc14e43..1fae017c0 100644
+index e50f7a3ca..194d55c30 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
@ -31,29 +31,17 @@ index 9bfc14e43..1fae017c0 100644
     protected int ticksFarFromPlayer;
     protected float aW;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 8e165f9db..05ac3811e 100644
+index dbda68dd0..af49b7273 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
         return this.bM != null;
     }
 
-+    public boolean inCaravan() { return this.dU(); } // Paper - OBFHELPER
-     public boolean dU() {
+    public boolean inCaravan() { return this.dW(); } // Paper - OBFHELPER
+     public boolean dW() {
         return this.bL != null;
     }
-diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index faa82f764..ba7f250c2 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
-+++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -294,6 +294,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
-         return Math.max(((Integer) this.datawatcher.get(EntityVillager.bz)).intValue() % 6, 0);
-     }
- 
-+    public final boolean isMating() { return this.dk(); } // Paper - OBFHELPER
-     public boolean dk() {
-         return this.bB;
-     }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
 index 83d9c43f3..1cb6652c2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
@ -108,7 +96,7 @@ index e5b5e9887..e3781f3a8 100644
                         }
                     }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 7396b35f5..428912cbc 100644
+index 47865c027..b08564618 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
@ -130,28 +118,28 @@ index 7396b35f5..428912cbc 100644
             }
 -            if ( entity instanceof EntityCreature && ( (EntityCreature) entity ).getGoalTarget() != null )
 +            if ( entity instanceof EntityCreature )
-+            {
+             {
+-                return true;
 +                // Paper start
 +                EntityCreature creature = (EntityCreature) entity;
 +                if (creature.getGoalTarget() != null || creature.getMovingTarget() != null) {
 +                    return true;
 +                }
 +                // Paper end
-+            }
-+            if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).isMating() ) // Paper
+             }
+             if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).isInLove() )
             {
                 return true;
             }
-            if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).dk()/* Getter for first boolean */ )
 +            // Paper start
 +            if ( entity instanceof EntityLlama && ( (EntityLlama ) entity ).inCaravan() )
-             {
-                 return true;
-             }
+            {
+                return true;
+            }
 +            // Paper end
             if ( entity instanceof EntityAnimal )
             {
                 EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0190-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0190-Firework-API-s.patch
@ -1,11 +1,11 @@
-From 1d664d9326e3b0efc0924d92a47926ab2420661f Mon Sep 17 00:00:00 2001
+From 3e0a09d98f51fee6fdebe6bd45aa59fbf57bc54d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's


 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 5e452b93c..28e12f7cc 100644
+index 48cdef5db..bd0ec95f2 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
@ -51,9 +51,9 @@ index 5e452b93c..28e12f7cc 100644
 +        // Paper end
     }
 
-     public boolean bb() {
+     public boolean bd() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index dc8952340..b7569b2bd 100644
+index b0bb4aa23..44a997215 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@ -129,5 +129,5 @@ index 99746b3c2..d4fbe31d6 100644
 +    // Paper end
 }
 -- 
-2.13.0
+2.13.1

--- a/Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch
@ -1,11 +1,11 @@
-From 1fbff2336b454ee0330c1cd5a380f3b4bf76b2cf Mon Sep 17 00:00:00 2001
+From 4c51ffc698c873bac8524df80f92e891660e09ba Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0a3d1969a..127eaf1f6 100644
+index cd2220b63..ba0bf2ee2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener {
@ -13,9 +13,9 @@ index 0a3d1969a..127eaf1f6 100644
 
     protected void o(Entity entity) {
 +        if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
-         if (entity.bH() != this) {
+         if (entity.bJ() != this) {
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         } else {
 -- 
-2.13.0.windows.1
+2.13.1

--- a/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch
@ -1,11 +1,11 @@
-From 701918eb9d15623a39667ee33c4b10a2866d2a52 Mon Sep 17 00:00:00 2001
+From 0dbdb19e62ecf0125d9ea94f1d79012236aa0400 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 091c96411..693f157ea 100644
+index 709c0150f..fd518061e 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -771,5 +771,10 @@ public class EntityArmorStand extends EntityLiving {
@ -20,26 +20,26 @@ index 091c96411..693f157ea 100644
     // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e5c7ee17f..00201988f 100644
+index b18fc969a..3c7c43902 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -189,6 +189,7 @@ public abstract class EntityLiving extends Entity {
         super.a(d0, flag, iblockdata, blockposition);
     }
 
-+    public boolean canBreatheUnderwater() { return this.bL(); } // Paper - OBFHELPER
-     public boolean bL() {
+    public boolean canBreatheUnderwater() { return this.bN(); } // Paper - OBFHELPER
+     public boolean bN() {
         return false;
     }
@@ -223,7 +224,7 @@ public abstract class EntityLiving extends Entity {
 
         if (this.isAlive()) {
             if (this.a(Material.WATER)) {
-                if (!this.bL() && !this.hasEffect(MobEffects.WATER_BREATHING) && !flag1) {
+-                if (!this.bN() && !this.hasEffect(MobEffects.WATER_BREATHING) && !flag1) {
 +                if (!this.canBreatheUnderwater() && !this.hasEffect(MobEffects.WATER_BREATHING) && !flag1) {
                     this.setAirTicks(this.d(this.getAirTicks()));
                     if (this.getAirTicks() == -20) {
                         this.setAirTicks(0);
 -- 
-2.13.0.windows.1
+2.13.1

--- a/work/BuildData
+++ b/work/BuildData
@ -1 +1 @@
-Subproject commit c93ef25131651aa8eb956e2397f7784e91ee7d93
+Subproject commit ebd264edb506ff3e72e92dd16b1b68c46905972c
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit e132104bf7d45f5c7c051396a8b011e3daee828c
+Subproject commit 7b5ab33d620b1d19e00152b4a0d64c160712c3b7
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit fe3ca95c764848be56e872e3de57c66cb07d7515
+Subproject commit bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit ac83d698d48a362995bcebe48ab89ab71bcf4d18
+Subproject commit ede465d4b574dc539984f807d2d8b37a78da1858