From 359d49f4f4c209961d31da39d30e8719db4346b9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 16 Jun 2021 16:05:02 -0500 Subject: [PATCH] update paper --- gradle.properties | 2 +- patches/server/0007-AFK-API.patch | 10 +++---- .../0010-LivingEntity-safeFallDistance.patch | 4 +-- .../0015-Player-invulnerabilities.patch | 28 +++++++++---------- .../0018-Alternative-Keepalive-Handling.patch | 4 +-- .../0026-Zombie-horse-naturally-spawn.patch | 4 +-- .../server/0044-Signs-allow-color-codes.patch | 8 +++--- ...-Minecart-settings-and-WASD-controls.patch | 4 +-- ...048-Players-should-not-cram-to-death.patch | 4 +-- ...0051-Fix-the-dead-lagging-the-server.patch | 6 ++-- .../0053-Add-permission-for-F3-N-debug.patch | 4 +-- ...urable-void-damage-height-and-damage.patch | 6 ++-- .../0071-Implement-elytra-settings.patch | 4 +-- .../server/0072-Item-entity-immunities.patch | 4 +-- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/gradle.properties b/gradle.properties index 166f64a3a..d4fd56ad1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=net.pl3x.purpur version=1.17-R0.1-SNAPSHOT packageVersion=1_17_R1 -paperCommit=4b17540b42a726d2f476967731f0864b5ceed9ca +paperCommit=080d3d737a7e338971ddfaefa0dc602cb4e3c3a5 org.gradle.parallel=true org.gradle.jvmargs=-Xmx3G diff --git a/patches/server/0007-AFK-API.patch b/patches/server/0007-AFK-API.patch index 03a984b65..5867279ab 100644 --- a/patches/server/0007-AFK-API.patch +++ b/patches/server/0007-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d23a86e6896cefea9eba0e354b25eaaffa09fa8c..f3842754684dcf3d27aa84ba51e61a48475a16aa 100644 +index b4055c6de62c22ba8ee8384884f9b3fd62eddeb8..16891782bc6038e493180c678d564f1f57a0f9a2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1881,8 +1881,54 @@ public class ServerPlayer extends Player { +@@ -1905,8 +1905,54 @@ public class ServerPlayer extends Player { public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); @@ -64,7 +64,7 @@ index d23a86e6896cefea9eba0e354b25eaaffa09fa8c..f3842754684dcf3d27aa84ba51e61a48 return this.stats; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3e5970979d6db8e07fc44a4c0bd2d2fd74115573..9d9390b2670353a5201d75418132993c51890298 100644 +index 40d0dac02bb1922483d68f3cdd09a228f66d09f6..b50ae4093b4bda0d62ec6ac445c969327871dd38 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -391,6 +391,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -215,10 +215,10 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c82a43f295e11a2f7f475ad1037e66dab145f57e..761e55ae057584eec937217c66029ffbaa710d0d 100644 +index 05007190441117fe8b2f8b54fc37e589ffc213dc..04b49b0d570d3049ffa756376e2f374a98335b67 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2443,4 +2443,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2453,4 +2453,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0010-LivingEntity-safeFallDistance.patch b/patches/server/0010-LivingEntity-safeFallDistance.patch index e5dfa3c3b..bebf67445 100644 --- a/patches/server/0010-LivingEntity-safeFallDistance.patch +++ b/patches/server/0010-LivingEntity-safeFallDistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 46bf9aaa8406228e74f007e153afc9bcc0efd6b5..a62d79fbd7f1974f98520c536948225c5dc53c12 100644 +index 58b36ed797476f3cec78529e09e913ebb791c5e3..644c339a9adae9500a8d7e20c9509af5eb2fece4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity { @@ -27,7 +27,7 @@ index 46bf9aaa8406228e74f007e153afc9bcc0efd6b5..a62d79fbd7f1974f98520c536948225c if (!landedState.isAir()) { double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D); -@@ -1879,7 +1880,7 @@ public abstract class LivingEntity extends Entity { +@@ -1880,7 +1881,7 @@ public abstract class LivingEntity extends Entity { MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP); float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1); diff --git a/patches/server/0015-Player-invulnerabilities.patch b/patches/server/0015-Player-invulnerabilities.patch index cdc617ab6..71a56f8ff 100644 --- a/patches/server/0015-Player-invulnerabilities.patch +++ b/patches/server/0015-Player-invulnerabilities.patch @@ -5,18 +5,18 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f3842754684dcf3d27aa84ba51e61a48475a16aa..02965cc9ca344cd9673ed3361f7c28b829a2d97b 100644 +index 16891782bc6038e493180c678d564f1f57a0f9a2..4a489763b70b48ec6817853328bcfadd8505bffb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -324,6 +324,7 @@ public class ServerPlayer extends Player { +@@ -332,6 +332,7 @@ public class ServerPlayer extends Player { this.bukkitPickUpLoot = true; this.maxHealthCache = this.getMaxHealth(); this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper + this.spawnInvulnerableTime = world.purpurConfig.playerSpawnInvulnerableTicks; // Purpur } - - // Yes, this doesn't match Vanilla, but it's the best we can do for now. -@@ -940,6 +941,12 @@ public class ServerPlayer extends Player { + // Paper start - Chunk priority + public BlockPos getPointInFront(double inFront) { +@@ -964,6 +965,12 @@ public class ServerPlayer extends Player { } @@ -29,7 +29,7 @@ index f3842754684dcf3d27aa84ba51e61a48475a16aa..02965cc9ca344cd9673ed3361f7c28b8 @Override public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { -@@ -947,7 +954,7 @@ public class ServerPlayer extends Player { +@@ -971,7 +978,7 @@ public class ServerPlayer extends Player { } else { boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId); @@ -38,7 +38,7 @@ index f3842754684dcf3d27aa84ba51e61a48475a16aa..02965cc9ca344cd9673ed3361f7c28b8 return false; } else { if (source instanceof EntityDamageSource) { -@@ -1122,6 +1129,7 @@ public class ServerPlayer extends Player { +@@ -1146,6 +1153,7 @@ public class ServerPlayer extends Player { } // Paper end @@ -46,7 +46,7 @@ index f3842754684dcf3d27aa84ba51e61a48475a16aa..02965cc9ca344cd9673ed3361f7c28b8 return this; } } -@@ -2340,8 +2348,16 @@ public class ServerPlayer extends Player { +@@ -2364,8 +2372,16 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { @@ -65,10 +65,10 @@ index f3842754684dcf3d27aa84ba51e61a48475a16aa..02965cc9ca344cd9673ed3361f7c28b8 @Override public Scoreboard getScoreboard() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9d9390b2670353a5201d75418132993c51890298..900bb6b5fdb9e1f07b8d8aef5539844cc6266839 100644 +index b50ae4093b4bda0d62ec6ac445c969327871dd38..23e536192bce9f85bebdcd8ba8dc019ca56fde90 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1860,6 +1860,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1861,6 +1861,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser } // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()]; @@ -77,10 +77,10 @@ index 9d9390b2670353a5201d75418132993c51890298..900bb6b5fdb9e1f07b8d8aef5539844c this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b0b4c6a3c6a8ffda142efd13596349f99a8e9daf..3c1e2c69b4661e3085b95f212737f0010711e888 100644 +index d6ecf7671663957b27ee0cadbfc57ce3a7be161c..bcff95d97549f56f542644f8348a84088ab56846 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -981,6 +981,8 @@ public abstract class PlayerList { +@@ -983,6 +983,8 @@ public abstract class PlayerList { } // Paper end @@ -106,10 +106,10 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 761e55ae057584eec937217c66029ffbaa710d0d..facb191a7e10df05e43da674918e7049e0eedb5d 100644 +index 04b49b0d570d3049ffa756376e2f374a98335b67..19f6bbf8e63c1f3f7391fe85fb283b8ee4fbfccc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2459,5 +2459,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2469,5 +2469,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/server/0018-Alternative-Keepalive-Handling.patch b/patches/server/0018-Alternative-Keepalive-Handling.patch index a1d52f6a0..51dd3bbb0 100644 --- a/patches/server/0018-Alternative-Keepalive-Handling.patch +++ b/patches/server/0018-Alternative-Keepalive-Handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 900bb6b5fdb9e1f07b8d8aef5539844cc6266839..7255ce0b4d3e424b05542abcc35300a30e39687e 100644 +index 23e536192bce9f85bebdcd8ba8dc019ca56fde90..5c4d8b3587ff2eae4669428be90df5bff4608045 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -229,6 +229,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -38,7 +38,7 @@ index 900bb6b5fdb9e1f07b8d8aef5539844cc6266839..7255ce0b4d3e424b05542abcc35300a3 if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3008,6 +3024,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3009,6 +3025,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0026-Zombie-horse-naturally-spawn.patch b/patches/server/0026-Zombie-horse-naturally-spawn.patch index 993277500..74fdb2167 100644 --- a/patches/server/0026-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0026-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ace160125bed7ee7fcc715a52436b12f4849b774..d25847efec7e09c34a9a98c5782d48348263e18e 100644 +index fe6d8b93f5685b611f1f2fe6ac28a0b718e198cc..31b9f57f74ae53c3f6cd5a16811b360ccb746a7a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -87,6 +87,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiManager; @@ -16,7 +16,7 @@ index ace160125bed7ee7fcc715a52436b12f4849b774..d25847efec7e09c34a9a98c5782d4834 import net.minecraft.world.entity.animal.horse.SkeletonHorse; import net.minecraft.world.entity.boss.EnderDragonPart; import net.minecraft.world.entity.boss.enderdragon.EnderDragon; -@@ -717,12 +718,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -712,12 +713,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * paperConfig.skeleHorseSpawnChance && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper if (flag1) { diff --git a/patches/server/0044-Signs-allow-color-codes.patch b/patches/server/0044-Signs-allow-color-codes.patch index 0e61d9513..d7766ba3b 100644 --- a/patches/server/0044-Signs-allow-color-codes.patch +++ b/patches/server/0044-Signs-allow-color-codes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 02965cc9ca344cd9673ed3361f7c28b829a2d97b..869bfb88d3d93a9601d97a1b03ead5969bbfd283 100644 +index 4a489763b70b48ec6817853328bcfadd8505bffb..b0191d4c4348bf523d9231405e4822fe9d45056a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1425,6 +1425,7 @@ public class ServerPlayer extends Player { +@@ -1449,6 +1449,7 @@ public class ServerPlayer extends Player { @Override public void openTextEdit(SignBlockEntity sign) { @@ -17,10 +17,10 @@ index 02965cc9ca344cd9673ed3361f7c28b829a2d97b..869bfb88d3d93a9601d97a1b03ead596 this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos())); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7255ce0b4d3e424b05542abcc35300a30e39687e..6680877abd9f0a6a66c6916dfaa899444fa6b52b 100644 +index 5c4d8b3587ff2eae4669428be90df5bff4608045..df7ae2126c5b8b81fefadc4245ba956f5916920f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2999,9 +2999,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3000,9 +3000,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser } // Paper end if (this.player.isTextFilteringEnabled()) { diff --git a/patches/server/0046-Minecart-settings-and-WASD-controls.patch b/patches/server/0046-Minecart-settings-and-WASD-controls.patch index 192219539..acbdb1a1b 100644 --- a/patches/server/0046-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0046-Minecart-settings-and-WASD-controls.patch @@ -22,10 +22,10 @@ index 22ea0da3836b61bb018ae974d2b8c7546b9528d6..dea8abfd8443702e138823bd536aaac2 super(x, y, z); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 869bfb88d3d93a9601d97a1b03ead5969bbfd283..a8f1aa81ec02deb75efef820508ec4be79545be8 100644 +index b0191d4c4348bf523d9231405e4822fe9d45056a..70a071e55fef2d3e3501b6909ea67798fb1662be 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -952,6 +952,7 @@ public class ServerPlayer extends Player { +@@ -976,6 +976,7 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0048-Players-should-not-cram-to-death.patch b/patches/server/0048-Players-should-not-cram-to-death.patch index 7b10d976c..535262841 100644 --- a/patches/server/0048-Players-should-not-cram-to-death.patch +++ b/patches/server/0048-Players-should-not-cram-to-death.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a8f1aa81ec02deb75efef820508ec4be79545be8..70f39fe5f9693762a0a765c58cb52bad354ec138 100644 +index 70a071e55fef2d3e3501b6909ea67798fb1662be..c965344a8828c9668864abac4caa341787bca9e1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1402,7 +1402,7 @@ public class ServerPlayer extends Player { +@@ -1426,7 +1426,7 @@ public class ServerPlayer extends Player { @Override public boolean isInvulnerableTo(DamageSource damageSource) { diff --git a/patches/server/0051-Fix-the-dead-lagging-the-server.patch b/patches/server/0051-Fix-the-dead-lagging-the-server.patch index 921121682..9debd4e84 100644 --- a/patches/server/0051-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0051-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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 985d097326ce3df372283217ce24371396307e0e..0583989b98d9a674a4feba30fbbb93e20724d375 100644 +index aaaf5d49972ab608473637dc884dd0c802deaae0..6f5db4ea95603390912cb8c43543586449e6c55f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1549,6 +1549,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -17,10 +17,10 @@ index 985d097326ce3df372283217ce24371396307e0e..0583989b98d9a674a4feba30fbbb93e2 public void absMoveTo(double x, double y, double z) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3cf3a6ba7bec27ce2ae9b294b0676fdc6c9e38b6..05e66973f19dacdf0609703b8a7c7c302b90e50f 100644 +index 422dc879c7554f5dbffd260dd60ef1cdb5d880a8..8e6a70ce404f499d7bbf26ebc5819ca88a6a7f53 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2876,7 +2876,7 @@ public abstract class LivingEntity extends Entity { +@@ -2877,7 +2877,7 @@ public abstract class LivingEntity extends Entity { } } diff --git a/patches/server/0053-Add-permission-for-F3-N-debug.patch b/patches/server/0053-Add-permission-for-F3-N-debug.patch index 8c91dc68a..e78aa1a86 100644 --- a/patches/server/0053-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0053-Add-permission-for-F3-N-debug.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3c1e2c69b4661e3085b95f212737f0010711e888..0dfb808a2b47dcd2d2ae34df3f0caa874a6bbe62 100644 +index bcff95d97549f56f542644f8348a84088ab56846..b95430f904d8a096afc7fcdc892d80f6097663ad 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1146,6 +1146,7 @@ public abstract class PlayerList { +@@ -1148,6 +1148,7 @@ public abstract class PlayerList { } else { b0 = (byte) (24 + i); } diff --git a/patches/server/0066-Configurable-void-damage-height-and-damage.patch b/patches/server/0066-Configurable-void-damage-height-and-damage.patch index 70d9643ca..447b40f73 100644 --- a/patches/server/0066-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0066-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0583989b98d9a674a4feba30fbbb93e20724d375..e33f4a5d0eb44974818ca532dd42cc3488e1de81 100644 +index 6f5db4ea95603390912cb8c43543586449e6c55f..1d4f8835ba5c719dd3b6dfcab4c1db180a9513b5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -698,7 +698,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -18,10 +18,10 @@ index 0583989b98d9a674a4feba30fbbb93e20724d375..e33f4a5d0eb44974818ca532dd42cc34 && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) { // Paper end diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 05e66973f19dacdf0609703b8a7c7c302b90e50f..2f7caed2506045c95c7f1dac1fa0c981695b3171 100644 +index 8e6a70ce404f499d7bbf26ebc5819ca88a6a7f53..4d9388ee79fd42d89a097127903a40700a28636e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2380,7 +2380,7 @@ public abstract class LivingEntity extends Entity { +@@ -2381,7 +2381,7 @@ public abstract class LivingEntity extends Entity { @Override protected void outOfWorld() { diff --git a/patches/server/0071-Implement-elytra-settings.patch b/patches/server/0071-Implement-elytra-settings.patch index 8bebfac41..444851d07 100644 --- a/patches/server/0071-Implement-elytra-settings.patch +++ b/patches/server/0071-Implement-elytra-settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2f7caed2506045c95c7f1dac1fa0c981695b3171..79cfe0511427a4919a6e2c0077dcfe3fb51132bb 100644 +index 4d9388ee79fd42d89a097127903a40700a28636e..e3877948e0901f849caa9b530bbd930d526c57f6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3260,7 +3260,16 @@ public abstract class LivingEntity extends Entity { +@@ -3261,7 +3261,16 @@ public abstract class LivingEntity extends Entity { int j = i / 10; if (j % 2 == 0) { diff --git a/patches/server/0072-Item-entity-immunities.patch b/patches/server/0072-Item-entity-immunities.patch index 440de3342..23f3f5478 100644 --- a/patches/server/0072-Item-entity-immunities.patch +++ b/patches/server/0072-Item-entity-immunities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b9049dd6e5f254289f20aefefaf68e2ef5adac1b..52bdfb437ae5e200cb0d5001948a8f5e3abbd89c 100644 +index 2921cc7226bba37af0b3c950038b909806c093a9..c47ede5c9129ce90d2c7360afbfa3a1234e69bdf 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -2046,7 +2046,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially +@@ -2199,7 +2199,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially public class TrackedEntity {