Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
98a702c7d [CI-SKIP] [Auto] Rebuild Patches
cab361600 Expose LivingEntity hurt direction
7ef05fbd8 Do not perform neighbour updates when using debug stick (Fixes #2134)

patches/server/0001-Tuinity-Server-Changes.patch

@@ -362,15 +362,6 @@ Copy passenger list in enderTeleportTo
 
 Fixes https://github.com/Spottedleaf/Tuinity/issues/208
 
-Apply more strict limitations to books
-
-For reference is the vanilla limits, this must be checked
-on update
-- Max book pages: 50
-- Max Length: 256
-
-Currently, patch limits to 50 pages and 512 characters.
-
 Rewrite the light engine
 
 The standard vanilla light engine is plagued by
@@ -8406,7 +8397,7 @@ index dcc5b098bfe36ef7ee8536b3da65c4ce1748c9d8..7b32a1fb79dcae355a8d95f3a8aa4284
              if (entityhuman != null) {
                  double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dd3287f953a1a24d2406816b3c0ae176476b6452..43a4b474273a58ac3995407e72e5b830696b9ba0 100644
+index 0294ff10dc8edb24aabfbe1589048a405c356ef0..9737c8b31482de140e14e58aa9baa8618d1c3fb4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2858,7 +2858,11 @@ public abstract class EntityLiving extends Entity {
@@ -11213,7 +11204,7 @@ index 6c399bcea03e839bf2f21e92b5d76d46b7088667..d3bf356ea768a32a5684eb851a2a0add
      }
      // Paper end - optimised tracker
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..df01083f826463cce714eccd5317791c781f04ed 100644
+index 4d3a427b16e1e0d6889faf4b913b212f8a6e938d..acaaf78c13f379f9b076d615c8a77ebc4bc8d2be 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -11227,44 +11218,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..df01083f826463cce714eccd5317791c
                      this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
                      return;
                  }
-@@ -898,6 +900,36 @@ public class PlayerConnection implements PacketListenerPlayIn {
- 
-     @Override
-     public void a(PacketPlayInBEdit packetplayinbedit) {
-+        // Tuinity start - apply strict vanilla limits to books
-+        ItemStack bookStack = packetplayinbedit.b();
-+        if (!bookStack.isEmpty() && bookStack.getTag() != null) {
-+            NBTTagList pages = bookStack.getTag().getList("pages", 8);
-+            if (pages != null && !pages.isEmpty()) {
-+                if (pages.size() > 50) {
-+                    this.minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
-+                    return;
-+                }
-+                for (int i = 0, len = pages.size(); i < len; ++i) {
-+                    NBTBase base = pages.get(i);
-+                    if (!(base instanceof NBTTagString)) {
-+                        this.minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
-+                        return;
-+                    }
-+                    String string = ((NBTTagString)base).asString();
-+                    if (string.length() <= 256) {
-+                        continue;
-+                    }
-+
-+                    if (string.length() > (256*2)) {
-+                        this.minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
-+                        return;
-+                    }
-+
-+                    // Don't check the full length of the string, it's too expensive, could be exploited.
-+                }
-+            }
-+        }
-+        // Tuinity end - apply strict vanilla limits to books
-         // Paper start
-         ItemStack testStack = packetplayinbedit.b(); // TODO(Proximyst): Add obfhelper here
-         if (!server.isPrimaryThread() && !testStack.isEmpty() && testStack.getTag() != null) {
-@@ -1058,7 +1090,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1068,7 +1070,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
  
                  if (this.teleportPos != null) {
@@ -11273,7 +11227,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..df01083f826463cce714eccd5317791c
                          this.A = this.e;
                          this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
                      }
-@@ -1128,7 +1160,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1138,7 +1140,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
                              // Paper start - Prevent moving into unloaded chunks
@@ -11282,7 +11236,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..df01083f826463cce714eccd5317791c
                                  this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
                                  return;
                              }
-@@ -1184,6 +1216,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1194,6 +1196,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              }
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -11290,7 +11244,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..df01083f826463cce714eccd5317791c
                              this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
                              // Paper start - prevent position desync
                              if (this.teleportPos != null) {
-@@ -1208,7 +1241,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1218,7 +1221,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);

patches/server/0009-AFK-API.patch

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index df01083f826463cce714eccd5317791c781f04ed..d27124959e4527cc7bfa1b38b8d9f5c56894a617 100644
+index acaaf78c13f379f9b076d615c8a77ebc4bc8d2be..c709ff1b228008a45c789903a535a0c95f26948f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -174,7 +174,7 @@ index df01083f826463cce714eccd5317791c781f04ed..d27124959e4527cc7bfa1b38b8d9f5c5
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1237,7 +1245,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1217,7 +1225,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                              if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
                                  flag1 = true;
@@ -183,7 +183,7 @@ index df01083f826463cce714eccd5317791c781f04ed..d27124959e4527cc7bfa1b38b8d9f5c5
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);
-@@ -1276,6 +1284,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1256,6 +1264,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
  

patches/server/0012-LivingEntity-safeFallDistance.patch

@@ -30,7 +30,7 @@ index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 43a4b474273a58ac3995407e72e5b830696b9ba0..876288defab03457555709fabaa0bc07ba58707b 100644
+index 9737c8b31482de140e14e58aa9baa8618d1c3fb4..e98e0ca17dbb683fad97be6b9f226e1ce579431f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
@@ -62,11 +62,11 @@ index 43a4b474273a58ac3995407e72e5b830696b9ba0..876288defab03457555709fabaa0bc07
  
      protected void playBlockStepSound() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1fc356d0b74c1cbb19bf7527088f1f61b6da5422..66447231244dbe3d6fadaa0d00710f9ec7f72445 100644
+index 16e69cfd4994fd6850ee3635ea819379412351c9..0292cae6225ae2ee156f436c8827a018e8ffa723 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -816,4 +816,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         getHandle().receive(((CraftItem) item).getHandle(), quantity);
+@@ -826,4 +826,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         getHandle().setHurtDirection(hurtDirection);
      }
      // Paper end
 +

patches/server/0017-EntityMoveEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 876288defab03457555709fabaa0bc07ba58707b..1af01a6b8a2ea0912d552880f69e7f0dfd5ec991 100644
+index e98e0ca17dbb683fad97be6b9f226e1ce579431f..4bbfb21d13c7e2f3ffcaaa31bd9ceee3755aa7cc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2813,6 +2813,20 @@ public abstract class EntityLiving extends Entity {

patches/server/0018-Player-invulnerabilities.patch

@@ -67,10 +67,10 @@ index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc572
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d27124959e4527cc7bfa1b38b8d9f5c56894a617..ed86e0b82682ae445c2430115e39588c0a77028d 100644
+index c709ff1b228008a45c789903a535a0c95f26948f..69feeaf08a37f30707aee19c955cd8ab0b3c3112 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1686,6 +1686,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1666,6 +1666,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];

patches/server/0021-Alternative-Keepalive-Handling.patch

@@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ed86e0b82682ae445c2430115e39588c0a77028d..529aa684e410762182f972be250be151e52b7003 100644
+index 69feeaf08a37f30707aee19c955cd8ab0b3c3112..db0c2886be026d8a833736bec3396bc0019c16fd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -50,7 +50,7 @@ index ed86e0b82682ae445c2430115e39588c0a77028d..529aa684e410762182f972be250be151
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2860,6 +2876,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2840,6 +2856,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

patches/server/0027-Giants-AI-settings.patch

@@ -147,7 +147,7 @@ index 7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db..b281ca841b2b7b51add3409318e2b92d
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1af01a6b8a2ea0912d552880f69e7f0dfd5ec991..1f408592d2af7b3b34f4a70506d1ffcd941c44e0 100644
+index 4bbfb21d13c7e2f3ffcaaa31bd9ceee3755aa7cc..9af491260a586d322796f8419d6aa1fffae10140 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2171,7 +2171,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0041-Cows-eat-mushrooms.patch

@@ -110,7 +110,7 @@ index 42e6761c8b18b79ffd3f4d5e853ea87a2c153c23..cfb009c811bd2908d38da1b0007cb7aa
      public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a((World) worldserver);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1f408592d2af7b3b34f4a70506d1ffcd941c44e0..8192cbe48cef4e856dd9b5f1e4e4f4ced7c89824 100644
+index 9af491260a586d322796f8419d6aa1fffae10140..594e2735cd58a0a19446369b34ba8282f2af2130 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0048-Signs-allow-color-codes.patch

@@ -17,10 +17,10 @@ index 5c4d9b1f4e926909439b9c290d7cc5726cb8822e..32d1ca467fd80de220c5bdefd23c1f84
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 529aa684e410762182f972be250be151e52b7003..0ef30ff92bb9e86b624c4988c00e3be6d95e554a 100644
+index db0c2886be026d8a833736bec3396bc0019c16fd..edac7a57c6c0612e87e836becbe59fc242e21b45 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2857,6 +2857,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2837,6 +2837,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end

patches/server/0050-Controllable-Minecarts.patch

@@ -22,7 +22,7 @@ index 2291135eaef64c403183724cb6e413cd7e472672..bc61aaff65a7dc1e7534452b285953b8
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8192cbe48cef4e856dd9b5f1e4e4f4ced7c89824..3138ca1cf56b7c89461b00a9e59c0a983d0fca77 100644
+index 594e2735cd58a0a19446369b34ba8282f2af2130..b9af6b392d4c7e83263d763eb86e77a407ca5ebf 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {

patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3138ca1cf56b7c89461b00a9e59c0a983d0fca77..65639d3485f5dad566a3f709eceffedc0848ccaf 100644
+index b9af6b392d4c7e83263d763eb86e77a407ca5ebf..9373b7123eb4f108a96638c3814d50a47426a049 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1490,8 +1490,10 @@ public abstract class EntityLiving extends Entity {

patches/server/0055-Debug-stick-should-not-update-neighbors.patch

@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 4 Apr 2020 17:16:30 -0500
-Subject: [PATCH] Debug stick should not update neighbors
-
-
-diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 3adb29f004d2fee36f3ee9b21ee5417e84b64837..e7759f24819ea7c62d3ae52ed1cc5c00f994a836 100644
---- a/src/main/java/net/minecraft/server/ItemStack.java
-+++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -229,6 +229,11 @@ public final class ItemStack {
-                 if (this.getItem() == Items.BONE_MEAL) {
-                     world.captureTreeGeneration = true;
-                 }
-+                // Purpur start
-+                else if (this.getItem() == Items.DEBUG_STICK) {
-+                    world.captureBlockStates = false;
-+                }
-+                // Purpur end
-             }
-             Item item = this.getItem();
-             EnumInteractionResult enuminteractionresult = item.a(itemactioncontext);

patches/server/0055-Fix-the-dead-lagging-the-server.patch

@@ -17,7 +17,7 @@ index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabf
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 65639d3485f5dad566a3f709eceffedc0848ccaf..5bde43be4294f0b55d699b2bf2bb598e9ef29fea 100644
+index 9373b7123eb4f108a96638c3814d50a47426a049..d774548cf872296384b1fd6317cedbd9a73f87d0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2489,7 +2489,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0075-Add-obfhelpers-for-plugin-use.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add obfhelpers for plugin use
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index e7759f24819ea7c62d3ae52ed1cc5c00f994a836..2c908a60401e851e56ec26e444d3c075cb256f24 100644
+index 5a62ac72edc49cd032cd02fa8d007959517d063b..fcdb82a4e54810a7da9f5d4e6a0d975c23a24884 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -644,6 +644,7 @@ public final class ItemStack {

patches/server/0076-Mending-mends-most-damages-equipment-first.patch

@@ -54,7 +54,7 @@ index c2be0c2bc315876f120cff207e5516dda2bd55d7..358d6d660581686a2e8d49e13e8c2ade
                  if (entry != null) {
                      ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2c908a60401e851e56ec26e444d3c075cb256f24..6a9b7e609489244c4d239895de77033f58632d9d 100644
+index fcdb82a4e54810a7da9f5d4e6a0d975c23a24884..0d011a1aae667f473f1ad2ec60d8506cd32dff6d 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -418,10 +418,19 @@ public final class ItemStack {

patches/server/0079-Implement-elytra-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5bde43be4294f0b55d699b2bf2bb598e9ef29fea..1e32658dc3dada926767c35ebf618e1b493d5607 100644
+index d774548cf872296384b1fd6317cedbd9a73f87d0..92095d28bfdcf309585b5684be3b880591b7d18c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2848,7 +2848,16 @@ public abstract class EntityLiving extends Entity {
@@ -46,7 +46,7 @@ index e775fe69ee7e555721bc73e7cb0dd3136736bc9c..990eb656699d9ead26b42fbb305530b7
                          itemstack.subtract(1);
                      } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 6a9b7e609489244c4d239895de77033f58632d9d..40f553e3950318f5a1940e3dccd0018653770fdb 100644
+index 0d011a1aae667f473f1ad2ec60d8506cd32dff6d..623bcb93cbdf0f67ee999104936f9d60c5228037 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -450,7 +450,7 @@ public final class ItemStack {

patches/server/0088-Allow-color-codes-in-books.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0ef30ff92bb9e86b624c4988c00e3be6d95e554a..01f7de31ac2ba2807edd90fd87acd2afac7b34e4 100644
+index edac7a57c6c0612e87e836becbe59fc242e21b45..b74ca27ed9fe341b65443bdf954b6c1419c77dd4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1038,7 +1038,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1018,7 +1018,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
          if (itemstack.getItem() == Items.WRITABLE_BOOK) {
              NBTTagList nbttaglist = new NBTTagList();
  
@@ -18,7 +18,7 @@ index 0ef30ff92bb9e86b624c4988c00e3be6d95e554a..01f7de31ac2ba2807edd90fd87acd2af
              ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
              itemstack.a("pages", (NBTBase) nbttaglist);
              CraftEventFactory.handleEditBookEvent(player, i, old, itemstack); // CraftBukkit
-@@ -1056,13 +1057,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1036,13 +1037,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  itemstack1.setTag(nbttagcompound.clone());
              }
  
@@ -35,7 +35,7 @@ index 0ef30ff92bb9e86b624c4988c00e3be6d95e554a..01f7de31ac2ba2807edd90fd87acd2af
                  ChatComponentText chatcomponenttext = new ChatComponentText(s1);
                  String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
  
-@@ -1074,6 +1076,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1054,6 +1056,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
      }
  

patches/server/0089-Entity-lifespan.patch

@@ -92,10 +92,10 @@ index 7a40f0864677e54c3a0eca6dcb9a115864edfbbd..1d5d87e61946c674f61541455cf54018
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 01f7de31ac2ba2807edd90fd87acd2afac7b34e4..a1a215dbf6fa050177d15ea6d7adcff1e6887e6e 100644
+index b74ca27ed9fe341b65443bdf954b6c1419c77dd4..c3fb79195021452c0e2ab41b56e67dc5b37f53be 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2249,6 +2249,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2229,6 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
                      Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
                      PlayerInteractEntityEvent event;

patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1e32658dc3dada926767c35ebf618e1b493d5607..c2a1e9679f9c18d29e060709e1b7818057ab12d2 100644
+index 92095d28bfdcf309585b5684be3b880591b7d18c..e2635413da43f4afc412c0443ab99bc3aaa0ca33 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -277,6 +277,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0097-Totems-work-in-inventory.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c2a1e9679f9c18d29e060709e1b7818057ab12d2..3ef4e807bd75748ec786cfa84f899896b0c7da58 100644
+index e2635413da43f4afc412c0443ab99bc3aaa0ca33..e37f37412b6bc24fa7a64823c30bd697731294d9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1324,6 +1324,19 @@ public abstract class EntityLiving extends Entity {

patches/server/0099-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a1a215dbf6fa050177d15ea6d7adcff1e6887e6e..a4c7f0a86fb5542d85b81ca3bda2fc475a03a8c0 100644
+index c3fb79195021452c0e2ab41b56e67dc5b37f53be..ef8cf33431994dfee767514a20ecaceeda9854f9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2008,7 +2008,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1988,7 +1988,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              return null;
                          }
  
@@ -26,7 +26,7 @@ index a1a215dbf6fa050177d15ea6d7adcff1e6887e6e..a4c7f0a86fb5542d85b81ca3bda2fc47
                          PlayerConnection.this.minecraftServer.console.sendMessage(message);
                          if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
                              for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
-@@ -2041,7 +2049,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2021,7 +2029,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  // Paper Start - (Meh) Support for vanilla world scoreboard name coloring
                  String displayName = event.getPlayer().getDisplayName();
                  if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {

patches/server/0110-Ridables.patch

@@ -2372,7 +2372,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3ef4e807bd75748ec786cfa84f899896b0c7da58..0da305798ed17b57d4100b526c49a222c90346a7 100644
+index e37f37412b6bc24fa7a64823c30bd697731294d9..84e37e38026e1fd5ec626c7c8b81972cd5ed2ea4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -459,7 +459,7 @@ public abstract class EntityLiving extends Entity {
@@ -4973,10 +4973,10 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a4c7f0a86fb5542d85b81ca3bda2fc475a03a8c0..8132180f9fff6e298a0efe00dee88f78210a1f6a 100644
+index ef8cf33431994dfee767514a20ecaceeda9854f9..f16109a08804e0942f2f41d9637bd9b88c1c8893 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2266,6 +2266,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2246,6 +2246,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                      this.server.getPluginManager().callEvent(event);
  

patches/server/0114-LivingEntity-broadcastItemBreak.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 66447231244dbe3d6fadaa0d00710f9ec7f72445..62bdc1abe3355d1c730bcacab29b72d89f843b97 100644
+index 0292cae6225ae2ee156f436c8827a018e8ffa723..9f5802364d4098173be2d08893efa697033407e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -827,5 +827,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -837,5 +837,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setSafeFallDistance(float safeFallDistance) {
          getHandle().safeFallDistance = safeFallDistance;
      }

patches/server/0134-Apply-display-names-from-item-forms-of-entities-to-e.patch

@@ -184,7 +184,7 @@ index a3eaeeda875d96fe4b047bd6bf993018722c96b9..f2f800087adb0238b4b672b9f6f4c8c4
  
              if (((EntityHanging) object).survives()) {
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 40f553e3950318f5a1940e3dccd0018653770fdb..7161eba52ece2b4d9ed982598642f486fd314965 100644
+index 623bcb93cbdf0f67ee999104936f9d60c5228037..eb115a9c2aac9abe28d36f6284ca84f694a4898d 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -738,6 +738,7 @@ public final class ItemStack {