Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a70924789 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
d1db107 Updated Upstream (Paper)

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

@@ -362,6 +362,15 @@ 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
@@ -7944,7 +7953,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 091d55c04c663df07c69f637515f53990c3c2d46..a4cf9e17a450f1603d3d1ed111404afea6e1d219 100644
+index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c4d1b51c2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -8328,7 +8337,7 @@ index 091d55c04c663df07c69f637515f53990c3c2d46..a4cf9e17a450f1603d3d1ed111404afe
          return false;
      }
  
-@@ -2844,7 +3076,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2842,7 +3074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.cp().forEach((entity) -> {
                  worldserver.chunkCheck(entity);
                  entity.az = true;
@@ -8337,7 +8346,7 @@ index 091d55c04c663df07c69f637515f53990c3c2d46..a4cf9e17a450f1603d3d1ed111404afe
  
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
-@@ -3302,12 +3534,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3300,12 +3532,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.locBlock;
      }
  
@@ -8354,7 +8363,7 @@ index 091d55c04c663df07c69f637515f53990c3c2d46..a4cf9e17a450f1603d3d1ed111404afe
      }
  
      public void setMot(double d0, double d1, double d2) {
-@@ -3362,7 +3598,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3360,7 +3596,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          }
          // Paper end
          if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
@@ -8397,10 +8406,10 @@ 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 53d193fab101192ee0e0a5519b78c354122db353..6a3d73b33f04e2c66b4ba9ebe58f887048ae83d6 100644
+index dd3287f953a1a24d2406816b3c0ae176476b6452..43a4b474273a58ac3995407e72e5b830696b9ba0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2852,7 +2852,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2858,7 +2858,11 @@ public abstract class EntityLiving extends Entity {
              return;
          }
          // Paper - end don't run getEntities if we're not going to use its result
@@ -8413,7 +8422,7 @@ index 53d193fab101192ee0e0a5519b78c354122db353..6a3d73b33f04e2c66b4ba9ebe58f8870
  
          if (!list.isEmpty()) {
              // Paper - move up
-@@ -2881,6 +2885,9 @@ public abstract class EntityLiving extends Entity {
+@@ -2887,6 +2891,9 @@ public abstract class EntityLiving extends Entity {
                  this.C(entity);
              }
          }
@@ -11204,7 +11213,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..dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b 100644
+index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..df01083f826463cce714eccd5317791c781f04ed 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 {
@@ -11218,7 +11227,44 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f26
                      this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
                      return;
                  }
-@@ -1058,7 +1060,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -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 {
                  }
  
                  if (this.teleportPos != null) {
@@ -11227,7 +11273,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f26
                          this.A = this.e;
                          this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
                      }
-@@ -1128,7 +1130,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1128,7 +1160,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
                              // Paper start - Prevent moving into unloaded chunks
@@ -11236,7 +11282,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f26
                                  this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
                                  return;
                              }
-@@ -1184,6 +1186,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1184,6 +1216,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              }
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -11244,7 +11290,7 @@ index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f26
                              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 +1211,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1208,7 +1241,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 dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7e01482f9 100644
+index df01083f826463cce714eccd5317791c781f04ed..d27124959e4527cc7bfa1b38b8d9f5c56894a617 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 dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1207,7 +1215,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1237,7 +1245,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 dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);
-@@ -1246,6 +1254,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1276,6 +1284,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 6a3d73b33f04e2c66b4ba9ebe58f887048ae83d6..fea03568e8af3a0b355204bab0c99fdd54913688 100644
+index 43a4b474273a58ac3995407e72e5b830696b9ba0..876288defab03457555709fabaa0bc07ba58707b 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 {

patches/server/0017-EntityMoveEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fea03568e8af3a0b355204bab0c99fdd54913688..521a9acee4fa73b4801dfe50645adcd6ddf96de4 100644
+index 876288defab03457555709fabaa0bc07ba58707b..1af01a6b8a2ea0912d552880f69e7f0dfd5ec991 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2807,6 +2807,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2813,6 +2813,20 @@ public abstract class EntityLiving extends Entity {
  
          this.collideNearby();
          this.world.getMethodProfiler().exit();

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 3a1016e345282eab9408c9caa294e7b7e01482f9..b59e82d8ca3132f448aba892741585406cdc023e 100644
+index d27124959e4527cc7bfa1b38b8d9f5c56894a617..ed86e0b82682ae445c2430115e39588c0a77028d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1656,6 +1656,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1686,6 +1686,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 b59e82d8ca3132f448aba892741585406cdc023e..c154c95ebba389290c7e2512e377b1c75a9c50e4 100644
+index ed86e0b82682ae445c2430115e39588c0a77028d..529aa684e410762182f972be250be151e52b7003 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 b59e82d8ca3132f448aba892741585406cdc023e..c154c95ebba389290c7e2512e377b1c7
          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
-@@ -2830,6 +2846,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2860,6 +2876,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

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

@@ -17,7 +17,7 @@ index c57e23e16b79017fe6dc084d634226cfdac772b5..92aa104dc51efa833eac289198bb9ee7
      public AttributeModifiable a(AttributeBase attributebase) {
          return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a4cf9e17a450f1603d3d1ed111404afea6e1d219..a756848c54b55ecde0d46f29f05afaf0042ad080 100644
+index d93db1049ef9421f6b3edd0dc52a421c4d1b51c2..0502ba688d3d16f15fea1ddda1f7d0bcbe59d701 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -147,10 +147,10 @@ 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 521a9acee4fa73b4801dfe50645adcd6ddf96de4..e003c446402eaea3125990d34f8b42e2a3965408 100644
+index 1af01a6b8a2ea0912d552880f69e7f0dfd5ec991..1f408592d2af7b3b34f4a70506d1ffcd941c44e0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2165,7 +2165,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2171,7 +2171,7 @@ public abstract class EntityLiving extends Entity {
          this.enderTeleportTo(vec3d.x, vec3d.y, vec3d.z);
      }
  

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a756848c54b55ecde0d46f29f05afaf0042ad080..97035ae751f9fcbd71aea18d15671df001fac6d3 100644
+index 0502ba688d3d16f15fea1ddda1f7d0bcbe59d701..bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2777,6 +2777,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2775,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -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 e003c446402eaea3125990d34f8b42e2a3965408..8a6237c71545c3966d12b661f703bd22121e3a8d 100644
+index 1f408592d2af7b3b34f4a70506d1ffcd941c44e0..8192cbe48cef4e856dd9b5f1e4e4f4ced7c89824 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 c154c95ebba389290c7e2512e377b1c75a9c50e4..e2cbffd113c3b49522786df62b4285fe6763434e 100644
+index 529aa684e410762182f972be250be151e52b7003..0ef30ff92bb9e86b624c4988c00e3be6d95e554a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2827,6 +2827,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2857,6 +2857,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 8a6237c71545c3966d12b661f703bd22121e3a8d..791e2b103c7b00e63a3f230cec13a297fa16a545 100644
+index 8192cbe48cef4e856dd9b5f1e4e4f4ced7c89824..3138ca1cf56b7c89461b00a9e59c0a983d0fca77 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 791e2b103c7b00e63a3f230cec13a297fa16a545..e83f82a5dc759cab34fb890bbefcb2a2775168d3 100644
+index 3138ca1cf56b7c89461b00a9e59c0a983d0fca77..65639d3485f5dad566a3f709eceffedc0848ccaf 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/0056-Fix-the-dead-lagging-the-server.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 97035ae751f9fcbd71aea18d15671df001fac6d3..a6293ead3f1fc7a95280c622e0dec7021800e0e1 100644
+index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index 97035ae751f9fcbd71aea18d15671df001fac6d3..a6293ead3f1fc7a95280c622e0dec702
  
      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 e83f82a5dc759cab34fb890bbefcb2a2775168d3..8d2586be431fb5ae828e822a2aaa9b7102f9a352 100644
+index 65639d3485f5dad566a3f709eceffedc0848ccaf..5bde43be4294f0b55d699b2bf2bb598e9ef29fea 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2483,7 +2483,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2489,7 +2489,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  

patches/server/0072-Add-canSaveToDisk-to-Entity.patch

@@ -17,7 +17,7 @@ index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97
                          final EntityTypes<?> projectileType = entity.getEntityType();
                          if (savedProjectileCounts.getOrDefault(projectileType, 0) >= worldserver.paperConfig.projectileSaveLimit) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6293ead3f1fc7a95280c622e0dec7021800e0e1..5ad2461a40012bc7423b8aa97c0c092e346f22ee 100644
+index 01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc..ca7189dbf4f8e71163de55ee89cad15390744f96 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0073-Configurable-void-damage-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5ad2461a40012bc7423b8aa97c0c092e346f22ee..0adca10e77d78f1d4d1a4fdfe208ca1f01249e6d 100644
+index ca7189dbf4f8e71163de55ee89cad15390744f96..ea1bccdc776c6eddbad1407cdc31a889875c8909 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@@ -5,10 +5,10 @@ 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 8d2586be431fb5ae828e822a2aaa9b7102f9a352..4e1796c06b35c8d262f67900f5079ecd42fa03df 100644
+index 5bde43be4294f0b55d699b2bf2bb598e9ef29fea..1e32658dc3dada926767c35ebf618e1b493d5607 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2842,7 +2842,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2848,7 +2848,16 @@ public abstract class EntityLiving extends Entity {
              if (itemstack.getItem() == Items.ELYTRA && ItemElytra.d(itemstack)) {
                  flag = true;
                  if (!this.world.isClientSide && (this.be + 1) % 20 == 0) {

patches/server/0081-Item-entity-immunities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0adca10e77d78f1d4d1a4fdfe208ca1f01249e6d..9dfcc915548c07d35ef3b49c8e1d04b0db78ef17 100644
+index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612b6efcd30 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -17,7 +17,7 @@ index 6fe5678cffc2487fe00c953d772f764bb37a4b11..bd0267ee4b3782f6d1ec39cba7966ba4
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9dfcc915548c07d35ef3b49c8e1d04b0db78ef17..129e86910b199f99bf373887e7940a8df9ee8089 100644
+index c2692d6d667d6404a044f1ad1c24e612b6efcd30..477e95ebecea183a2ad3d1daac3b4010b7263c99 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2135,8 +2135,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0089-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 e2cbffd113c3b49522786df62b4285fe6763434e..7dab659663f0b9e115e3eee98ef71c072f52f061 100644
+index 0ef30ff92bb9e86b624c4988c00e3be6d95e554a..01f7de31ac2ba2807edd90fd87acd2afac7b34e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1008,7 +1008,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1038,7 +1038,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
          if (itemstack.getItem() == Items.WRITABLE_BOOK) {
              NBTTagList nbttaglist = new NBTTagList();
  
@@ -18,7 +18,7 @@ index e2cbffd113c3b49522786df62b4285fe6763434e..7dab659663f0b9e115e3eee98ef71c07
              ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
              itemstack.a("pages", (NBTBase) nbttaglist);
              CraftEventFactory.handleEditBookEvent(player, i, old, itemstack); // CraftBukkit
-@@ -1026,13 +1027,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1056,13 +1057,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  itemstack1.setTag(nbttagcompound.clone());
              }
  
@@ -35,7 +35,7 @@ index e2cbffd113c3b49522786df62b4285fe6763434e..7dab659663f0b9e115e3eee98ef71c07
                  ChatComponentText chatcomponenttext = new ChatComponentText(s1);
                  String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
  
-@@ -1044,6 +1046,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1074,6 +1076,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
      }
  

patches/server/0090-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 7dab659663f0b9e115e3eee98ef71c072f52f061..54b77cab50fedb529998cb972cbe68b6f94f1dc4 100644
+index 01f7de31ac2ba2807edd90fd87acd2afac7b34e4..a1a215dbf6fa050177d15ea6d7adcff1e6887e6e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2219,6 +2219,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2249,6 +2249,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/0091-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 4e1796c06b35c8d262f67900f5079ecd42fa03df..e6b390709d7e3d8596a7814422e4d41fba0c11c2 100644
+index 1e32658dc3dada926767c35ebf618e1b493d5607..c2a1e9679f9c18d29e060709e1b7818057ab12d2 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/0098-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 e6b390709d7e3d8596a7814422e4d41fba0c11c2..03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72 100644
+index c2a1e9679f9c18d29e060709e1b7818057ab12d2..3ef4e807bd75748ec786cfa84f899896b0c7da58 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/0100-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 54b77cab50fedb529998cb972cbe68b6f94f1dc4..68a2bf3112786a6c9fb8cd5a0c82d8730ecfb15a 100644
+index a1a215dbf6fa050177d15ea6d7adcff1e6887e6e..a4c7f0a86fb5542d85b81ca3bda2fc475a03a8c0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1978,7 +1978,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2008,7 +2008,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              return null;
                          }
  
@@ -26,7 +26,7 @@ index 54b77cab50fedb529998cb972cbe68b6f94f1dc4..68a2bf3112786a6c9fb8cd5a0c82d873
                          PlayerConnection.this.minecraftServer.console.sendMessage(message);
                          if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
                              for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
-@@ -2011,7 +2019,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2041,7 +2049,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-Stop-squids-floating-on-top-of-water.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 129e86910b199f99bf373887e7940a8df9ee8089..88a034bb8eded45ec6e670a69f04b07b28be211a 100644
+index 477e95ebecea183a2ad3d1daac3b4010b7263c99..a12bcda00cb615b0832157f633c4a987e78c8404 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -3440,8 +3440,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3438,8 +3438,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.lastYaw = this.yaw;
      }
  

patches/server/0111-Ridables.patch

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
          this.B = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963d7a9193f 100644
+index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d42784775fb1626e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -243,7 +243,7 @@ index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2537,6 +2552,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2535,6 +2550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -251,7 +251,7 @@ index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963
      public boolean bE() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2759,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2757,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -259,7 +259,7 @@ index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963
      public void n(float f) {}
  
      public boolean bL() {
-@@ -3193,6 +3210,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3191,6 +3208,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -278,7 +278,7 @@ index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
  
-@@ -3645,4 +3674,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3643,4 +3672,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
      }
      // Paper end
@@ -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 03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72..29fdb7c682eda00e04431cecea57f2f395ac2cb3 100644
+index 3ef4e807bd75748ec786cfa84f899896b0c7da58..0da305798ed17b57d4100b526c49a222c90346a7 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 {
@@ -2384,7 +2384,7 @@ index 03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72..29fdb7c682eda00e04431cecea57f2f3
      }
  
      protected void cU() {
-@@ -2185,7 +2185,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2191,7 +2191,7 @@ public abstract class EntityLiving extends Entity {
          return 0.42F * this.getBlockJumpFactor();
      }
  
@@ -2393,7 +2393,7 @@ index 03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72..29fdb7c682eda00e04431cecea57f2f3
          float f = this.dJ();
  
          if (this.hasEffect(MobEffects.JUMP)) {
-@@ -2434,10 +2434,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2440,10 +2440,12 @@ public abstract class EntityLiving extends Entity {
          return this.onGround ? this.dN() * (0.21600002F / (f * f * f)) : this.aE;
      }
  
@@ -2406,7 +2406,7 @@ index 03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72..29fdb7c682eda00e04431cecea57f2f3
      public void q(float f) {
          this.bu = f;
      }
-@@ -2837,6 +2839,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2843,6 +2845,20 @@ public abstract class EntityLiving extends Entity {
              }
          }
          // Purpur end
@@ -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 68a2bf3112786a6c9fb8cd5a0c82d8730ecfb15a..dcbed41f6dd03e3f01e9741f55c57688f36b5ced 100644
+index a4c7f0a86fb5542d85b81ca3bda2fc475a03a8c0..8132180f9fff6e298a0efe00dee88f78210a1f6a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2236,6 +2236,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2266,6 +2266,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                      this.server.getPluginManager().callEvent(event);
  

patches/server/0114-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 64b746151368fbec60a706f1ad51a963d7a9193f..6b1088ff9f69314ed36a809bd9f04f548d5e9469 100644
+index 3eef1534c0dc3c6089f0d619d42784775fb1626e..28c502b5721bd150d9b9d2d84cb07c55af8373f1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2411,7 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 64b746151368fbec60a706f1ad51a963d7a9193f..6b1088ff9f69314ed36a809bd9f04f54
              if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
                  this.ac = blockposition.immutableCopy();
              }
-@@ -2986,7 +2986,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2984,7 +2984,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean canPortal() {

patches/server/0154-Lobotomize-stuck-villagers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b1088ff9f69314ed36a809bd9f04f548d5e9469..12f2cf5fd76b4d05038e2c2a2757553863752a86 100644
+index 28c502b5721bd150d9b9d2d84cb07c55af8373f1..98e8f8d7751ca7489c7cb4d41e4f628dec7b5c5d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch

@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 29fdb7c682eda00e04431cecea57f2f395ac2cb3..9423e2e7975b1401fcc57506b733bf5034e7fe36 100644
+index 0da305798ed17b57d4100b526c49a222c90346a7..9b7e1ffff9736f9ba8d2fa355dc0771424ce3bf2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2091,6 +2091,7 @@ public abstract class EntityLiving extends Entity {