Update to 1.12-pre6

2025-01-16 21:31:25 +01:00 · 2017-05-31 09:04:52 +01:00 · 2017-05-31 09:04:52 +01:00 · 9cf2e3b3dc
commit 9cf2e3b3dc
parent 529a9626f4
38 changed files with 79 additions and 77 deletions
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@ -5,7 +5,7 @@ Subject: [PATCH] POM changes


 diff --git a/pom.xml b/pom.xml
-index 66bb7a12..0899a127 100644
+index df62fbd8..31991487 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@ -24,7 +24,7 @@ index 66bb7a12..0899a127 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.12-pre5-SNAPSHOT</version>
+     <version>1.12-pre6-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Spigot-API</name>
--- a/Spigot-Server-Patches/Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/Add-PlayerUseUnknownEntityEvent.patch
@ -18,7 +18,7 @@ index c67cb54a3..521f46262 100644
     private Vec3D c;
     private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3b4b5cf8c..81f8e0fd0 100644
+index cef07eb1b..e20a166b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -6,11 +6,11 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client


 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index a46df4b7f..f02263c34 100644
+index 8bac1e161..9640df356 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -0,0 +0,0 @@ public class HandshakeListener implements PacketHandshakingInListener {
-                 this.b.close(chatcomponenttext);
+                 this.b.close(chatmessage);
             } else {
                 this.b.setPacketListener(new LoginListener(this.a, this.b));
 +                // Paper start - handshake event
@ -22,9 +22,9 @@ index a46df4b7f..f02263c34 100644
 +                    if (event.callEvent()) {
 +                        // If we've failed somehow, let the client know so and go no further.
 +                        if (event.isFailed()) {
-+                            chatcomponenttext = new ChatComponentText(event.getFailMessage());
-+                            this.b.sendPacket(new PacketLoginOutDisconnect(chatcomponenttext));
-+                            this.b.close(chatcomponenttext);
+                            chatmessage = new ChatMessage(event.getFailMessage());
+                            this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage));
+                            this.b.close(chatmessage);
 +                            return;
 +                        }
 +
--- a/Spigot-Server-Patches/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -26,20 +26,20 @@ index af953dda4..1ce3aaa8c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7d79e4625..a977a6775 100644
+index 2bfbfcb9e..f5e55eaf0 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
         this.j(this.getShoulderEntityLeft());
         this.j(this.getShoulderEntityRight());
-         if (!this.world.isClientSide && (!this.onGround || this.isInWater() || this.isPassenger())) {
+         if (!this.world.isClientSide && (this.fallDistance > 0.5F || this.isInWater() || this.isPassenger()) || this.abilities.isFlying) {
 -            this.releaseShoulderEntities();
 +            if (!this.world.paperConfig.parrotsHangOnBetter) this.releaseShoulderEntities(); // Paper - Hang on!
         }
 
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9b78df95c..3c59a2f40 100644
+index 624d4be8f..7551ebf55 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/Add-player-view-distance-API.patch
@ -5,7 +5,7 @@ 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 9a5b8f083..a8038881d 100644
+index efce9048b..76588e4a2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/Auto-Save-Improvements.patch
@ -96,7 +96,7 @@ index 9836c0c5a..39f0f5a17 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fff461e3c..39311e1d1 100644
+index 628597330..c4eabc0e4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -108,7 +108,7 @@ index fff461e3c..39311e1d1 100644
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 374ab7294..6f6cc49c0 100644
+index aab89ac47..0ee5a7b64 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -155,7 +155,7 @@ index 374ab7294..6f6cc49c0 100644
         this.methodProfiler.a("tallying");
         // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a6576841b..f40bd1f46 100644
+index 1fc107b53..fb59fecc4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -0,0 +0,0 @@ public abstract class PlayerList {
--- a/Spigot-Server-Patches/Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/Auto-fix-bad-Y-levels-on-player-login.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 39311e1d1..04c36d36e 100644
+index c4eabc0e4..dac698614 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/Cache-user-authenticator-threads.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads


 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index fe390feb9..350ec0323 100644
+index 57f728567..2158fcd32 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable {
--- a/Spigot-Server-Patches/Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/Chunk-registration-fixes.patch
@ -8,15 +8,15 @@ 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 28c249718..b12d464dc 100644
+index 45484a813..36c22911a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
         }
 
-         int i = MathHelper.floor(entity.locX / 16.0D);
-        int j = MathHelper.floor(entity.locY / 16.0D);
-+        int j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
+         i = MathHelper.floor(entity.locX / 16.0D);
+-        j = MathHelper.floor(entity.locY / 16.0D);
+        j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
         int k = MathHelper.floor(entity.locZ / 16.0D);
 
         if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
--- a/Spigot-Server-Patches/Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/Complete-resource-pack-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8bd9f2113..8dc7b1893 100644
+index a8c10d3b0..cef07eb1b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cf2c4ea3b..0ce50541c 100644
+index 0e819a43c..fce7774fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -39,7 +39,7 @@ index cf2c4ea3b..0ce50541c 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 fee13283f..33776d905 100644
+index 16b825884..54076b4bc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/Configurable-container-update-tick-rate.patch
@ -19,7 +19,7 @@ index 1bb956515..e6aae7317 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a8038881d..6fdde5c07 100644
+index 76588e4a2..59967e81e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/Configurable-end-credits.patch
@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0d16f65c8..9a5b8f083 100644
+index e2369e7f2..efce9048b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/Configurable-flying-kick-messages.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d765607c0..5b4d715a4 100644
+index 2001175bf..621c585e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
@ -21,14 +21,14 @@ index d765607c0..5b4d715a4 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7b8e7f343..d2742df61 100644
+index c5e89997e..94953307b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
         if (this.B) {
             if (++this.C > 80) {
                 PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getName());
-                this.disconnect("Flying is not enabled on this server");
+-                this.disconnect(new ChatMessage("multiplayer.disconnect.flying", new Object[0]));
 +                this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
                 return;
             }
@ -37,7 +37,7 @@ index 7b8e7f343..d2742df61 100644
             if (this.D && this.player.getVehicle().bC() == this.player) {
                 if (++this.E > 80) {
                     PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName());
-                    this.disconnect("Flying is not enabled on this server");
+-                    this.disconnect(new ChatMessage("multiplayer.disconnect.flying", new Object[0]));
 +                    this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickVehicleMessage); // Paper - use configurable kick message
                     return;
                 }
--- a/Spigot-Server-Patches/Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/Configurable-packet-in-spam-threshold.patch
@ -23,7 +23,7 @@ index cf06f8ac3..2001175bf 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 73baf015b..de8c9a3a5 100644
+index 28a83ce3d..c5e89997e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@ -5,7 +5,7 @@ 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 85cd83c35..364cfe885 100644
+index 65f84b419..958af4121 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/Ensure-commands-are-not-ran-async.patch
@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c4fe706a..9be557062 100644
+index 4c08373ba..a8c10d3b0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/Fix-AIOOBE-in-inventory-handling.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix AIOOBE in inventory handling


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c2e93bb45..73baf015b 100644
+index a99edb869..28a83ce3d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/Fix-FallingBlocks-being-stuck-on-fences.patch
@ -25,7 +25,7 @@ index d2a542354..c74071eb1 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java
-index db5c0deae..9bcfc336f 100644
+index 674395756..1086e3117 100644
 --- a/src/main/java/net/minecraft/server/BlockFalling.java
 +++ b/src/main/java/net/minecraft/server/BlockFalling.java
@@ -0,0 +0,0 @@ public class BlockFalling extends Block {
@ -34,7 +34,7 @@ index db5c0deae..9bcfc336f 100644
 
 +    // Paper start - OBFHELPER
 +    public static boolean canMoveThrough(IBlockData blockdata) {
-+        return BlockFalling.i(blockdata);
+        return BlockFalling.x(blockdata);
 +    }
 +    // Paper end
 +
@ -42,7 +42,7 @@ index db5c0deae..9bcfc336f 100644
 
     public void a_(World world, BlockPosition blockposition) {}
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 18e7cf2ad..6a22dce51 100644
+index 70a196461..3c7bdccc4 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@ -54,10 +54,12 @@ index 18e7cf2ad..6a22dce51 100644
 
 import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
@@ -0,0 +0,0 @@ public class EntityFallingBlock extends Entity {
+                     }
                 } else {
                     IBlockData iblockdata = this.world.getType(blockposition);
- 
-                    if (!flag1 && BlockFalling.i(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
+-
+-                    if (!flag1 && BlockFalling.x(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
+                    
 +                    if (!isOnGround()) {
                         this.onGround = false;
 -                        // return; // CraftBukkit
--- a/Spigot-Server-Patches/Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/Fix-block-break-desync.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix block break desync


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 32baff5e2..9b78df95c 100644
+index 387cfa753..624d4be8f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/IllegalPacketEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2c29bc634..8c18f1413 100644
+index 94953307b..98880f980 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;
--- a/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch
@ -5,14 +5,14 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6fdde5c07..33f34ed0e 100644
+index 59967e81e..49795c588 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.MainHand;
 public class EntityPlayer extends EntityHuman implements ICrafting {
 
     private static final Logger bV = LogManager.getLogger();
-    public String locale = "en_us"; // PAIL: private -> public
+-    public String locale = "en_us"; // CraftBukkit - lowercase
 +    public String locale = null; // PAIL: private -> public // Paper - default to null
     public PlayerConnection playerConnection;
     public final MinecraftServer server;
--- a/Spigot-Server-Patches/More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/More-informative-vehicle-moved-wrongly-message.patch
@ -5,7 +5,7 @@ Subject: [PATCH] More informative vehicle moved wrongly message


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 353e73b15..b8ec71a93 100644
+index 76784a3af..a99edb869 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/Optimise-NetworkManager.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Optimise NetworkManager


 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 58011bb2f..fb118e90b 100644
+index d583cced6..89743d2be 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -76,7 +76,7 @@ index 58011bb2f..fb118e90b 100644
     public void a() {
@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
                 } else if (this.i() != null) {
-                     this.i().a(new ChatComponentText("Disconnected"));
+                     this.i().a(new ChatMessage("multiplayer.disconnect.generic", new Object[0]));
                 }
 -                this.i.clear(); // Free up packet queue.
 +                 // this.i.clear(); // Free up packet queue. // Paper - remove unneeded packet queue
--- a/Spigot-Server-Patches/Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/Optimise-removeQueue.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Optimise removeQueue


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 04c36d36e..2ee3fb782 100644
+index dac698614..5e17a13e6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@ -18,7 +18,7 @@ index 04c36d36e..2ee3fb782 100644
 +import java.util.Deque; // Paper
 import java.util.Iterator;
 import java.util.List;
- import javax.annotation.Nonnull;
+ import javax.annotation.Nullable;
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public final PlayerInteractManager playerInteractManager;
     public double d;
--- a/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 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 20bdf4055..1cd81e533 100644
+index b34af0ffc..c3fbbab09 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@ -19,7 +19,7 @@ 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 5428220a0..3177c17c4 100644
+index 9a47d00c0..f6d04c3d5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
@ -31,7 +31,7 @@ index 5428220a0..3177c17c4 100644
     public ScoreboardTeamBase aW() {
         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 81f8e0fd0..b5284cecd 100644
+index e20a166b7..76784a3af 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes


 diff --git a/pom.xml b/pom.xml
-index 31cb11194..167bc0ac2 100644
+index ed0ddbd86..fce7fe4d0 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@ -17,7 +17,7 @@ index 31cb11194..167bc0ac2 100644
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper</artifactId>
     <packaging>jar</packaging>
-     <version>1.12-pre5-SNAPSHOT</version>
+     <version>1.12-pre6-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>Paper</name>
--- a/Spigot-Server-Patches/Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 186e2df8b..dcd2ac6ab 100644
+index 995a9ddb1..d7061ce01 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@ -30,7 +30,7 @@ index bb27f5dd8..65b7b33be 100644
                 double d1 = entityhuman.locY - this.locY;
                 double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index dcc251e31..d8344ddc9 100644
+index 130aafc83..7d486f1ca 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -0,0 +0,0 @@ public class EntitySilverfish extends EntityMonster {
@ -57,7 +57,7 @@ index a599a043d..1c7c187c7 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 6b404e385..3d114cfea 100644
+index 2ba929100..4fc95c86b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/Properly-fix-item-duplication-bug.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2ee3fb782..93f0dfedf 100644
+index 5e17a13e6..e05d65728 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -19,7 +19,7 @@ index 2ee3fb782..93f0dfedf 100644
 
     public void reset() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8c18f1413..41ad0cc2b 100644
+index 98880f980..387cfa753 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/Re-track-players-that-dismount-from-other-players.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Re-track players that dismount from other players


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 33f34ed0e..fff461e3c 100644
+index 49795c588..628597330 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
@ -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 e301eaf9d..0ddc03507 100644
+index 958af4121..755e7a0d8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Timings v2


 diff --git a/pom.xml b/pom.xml
-index 167bc0ac2..6b73c55f9 100644
+index fce7fe4d0..ad910df98 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@ -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 7c39edca8..6c1c5e566 100644
+index 4cb71b294..ec406644c 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -0,0 +0,0 @@ public class Block {
@ -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 b23de7663..fe64ee4aa 100644
+index 80a5b2013..403a2cb2e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -571,7 +571,7 @@ index b23de7663..fe64ee4aa 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 70fde368f..c56aa5c19 100644
+index 6abbc3bc3..11f62b9b9 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -0,0 +0,0 @@ import java.io.PrintStream;
@ -624,7 +624,7 @@ index 70fde368f..c56aa5c19 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 48fb9662f..c7b8ae636 100644
+index 0138ac4ab..5d47bc459 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ import org.bukkit.block.BlockFace;
@ -663,7 +663,7 @@ index 48fb9662f..c7b8ae636 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 bf2761d53..5a2dbe5ff 100644
+index cb483dc2a..9e31db26d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -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 249fccce9..3629cbc47 100644
+index 3961a5fe6..8dbbab3ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ 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 fb5eefc11..9eaa3a2ac 100644
+index 1bcf74400..4c08373ba 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ 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 35f421164..4a8927798 100644
+index 4798dd4f5..acdc68c8f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -0,0 +0,0 @@
@ -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 41f0ac2bf..919f041d9 100644
+index 17255e2d5..e51a288a8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ import com.google.common.collect.Maps;
@ -1270,7 +1270,7 @@ index 41f0ac2bf..919f041d9 100644
             ++entity.ticksLived;
 +            ++co.aikar.timings.TimingHistory.activatedEntityTicks; // Paper
             if (entity.isPassenger()) {
-                 entity.leaveVehicle();
+                 entity.aC();
             } else {
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
                 }
--- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c5c701f08..902df7ac6 100644
+index 9be8c6ff5..09b2042e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
@ -31,7 +31,7 @@ index c0d97f154..363209170 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 7c12338a5..8537f65fd 100644
+index 391282afc..b4ef1d6af 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
--- a/work/BuildData
+++ b/work/BuildData
@ -1 +1 @@
-Subproject commit ceb1b906afeaa302a4038f73c2d2029914c6a6b2
+Subproject commit c93ef25131651aa8eb956e2397f7784e91ee7d93
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit c62b9cd3e2ca0b73957eac0696447c79b6fe389f
+Subproject commit 80c927a7496c4a4c0085ca84668ea458a03e055e
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit c155d8dd32556a197ab73c437760e6194ae4e04a
+Subproject commit e13d1196863d5dcfea3d17b79238427dfb2c61b2
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit ea4525e6830e7545c5315fc557a6fc6dcdf3f4ae
+Subproject commit ac83d698d48a362995bcebe48ab89ab71bcf4d18