From 49db8494f127327dd8bc41dd797f71b6bbcaaf4e Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 31 Aug 2024 20:37:16 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e01ddf4 Fixup porting issue in vanillaBiomeProvider impl (#11185) PaperMC/Paper@509ea2f Fix horse armor desync (#11341) PaperMC/Paper@2f0891e Fix InventoryOpenEvent cancellation (#11304) PaperMC/Paper@227c94a Fix inventory desync when placing blocks with spawn protection (#11090) --- gradle.properties | 2 +- .../0008-Component-related-conveniences.patch | 6 +++--- .../0011-Barrels-and-enderchests-6-rows.patch | 16 ++++++++-------- patches/server/0013-AFK-API.patch | 6 +++--- ...-teleport-to-spawn-if-outside-world-bor.patch | 4 ++-- ...ests-to-open-even-with-a-solid-block-on.patch | 4 ++-- patches/server/0115-Implement-TPSBar.patch | 6 +++--- .../0140-Sneak-to-bulk-process-composter.patch | 4 ++-- patches/server/0190-Add-compass-command.patch | 4 ++-- ...hift-right-click-to-use-exp-for-mending.patch | 6 +++--- patches/server/0243-Stonecutter-damage.patch | 4 ++-- .../server/0251-Add-local-difficulty-api.patch | 4 ++-- patches/server/0257-Debug-Marker-API.patch | 4 ++-- .../0262-Implement-ram-and-rambar-commands.patch | 4 ++-- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gradle.properties b/gradle.properties index 03437c094..b1da2809f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.1-R0.1-SNAPSHOT mcVersion = 1.21.1 -paperCommit = 25621248d3f30f35c3458b4b13a2474ffd0bee0e +paperCommit = 227c94ae21634e3cba5992ac29bb2b258f039067 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0008-Component-related-conveniences.patch b/patches/server/0008-Component-related-conveniences.patch index 975c0e842..ebf481c22 100644 --- a/patches/server/0008-Component-related-conveniences.patch +++ b/patches/server/0008-Component-related-conveniences.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cb25a8796dda84fb08865a2af769fb4d10597685..ffc7f4f4544df21b713b780eded8aeba4090db52 100644 +index 2e45bc48c8a86d9522e4574bf3037611cfda63a3..98fd4d8aab273ab86bcb9b95a331cd8bbcb61373 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2004,6 +2004,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -2008,6 +2008,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple this.lastSentExp = -1; // CraftBukkit - Added to reset } @@ -81,7 +81,7 @@ index bb1a60180e58c1333e7bb33e8acf1b0225eda8a8..c83e80ebdbbfb2d0e08561a44486a308 return this.type().msgId(); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 52af2341b1ce1ee358d60505f34018a5acd09176..9dd838972d83196dfda620b223ea17fbf7c125a4 100644 +index b3b602076e18b45ce773bafba8f6811aba5321ec..e2907879dbe758ffe728d77ebde434b1e7382a96 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4185,6 +4185,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0011-Barrels-and-enderchests-6-rows.patch b/patches/server/0011-Barrels-and-enderchests-6-rows.patch index d9cb39ece..0b8878bb4 100644 --- a/patches/server/0011-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0011-Barrels-and-enderchests-6-rows.patch @@ -108,19 +108,19 @@ index a15d5ff872dbd77f3c3145e0328f3d02e431ff8c..1dcf36d502990d32fc4cd3ea69c3ea33 this.activeChest = blockEntity; } diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java -index ca92d49ef2010ba00c623491671dcde8ebe697c1..bd65df4588584b8bb001e9dc3656a14e381a0b6d 100644 +index 491a59336899179c79820cd61541d49f7337c0f6..492fda30f22c8d09271931229ec02bb6f98f5889 100644 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java -@@ -91,7 +91,7 @@ public class EnderChestBlock extends AbstractChestBlock i - EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity; +@@ -92,7 +92,7 @@ public class EnderChestBlock extends AbstractChestBlock i playerEnderChestContainer.setActiveChest(enderChestBlockEntity); - player.openMenu( + // Paper start - Fix InventoryOpenEvent cancellation + if (player.openMenu( - new SimpleMenuProvider((i, inventory, playerx) -> ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE) + new SimpleMenuProvider((i, inventory, playerx) -> org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? getEnderChestSixRows(i, inventory, player, playerEnderChestContainer) : ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE) // Purpur - ); - player.awardStat(Stats.OPEN_ENDERCHEST); - PiglinAi.angerNearbyPiglins(player, true); -@@ -102,6 +102,35 @@ public class EnderChestBlock extends AbstractChestBlock i + ).isPresent()) { + player.awardStat(Stats.OPEN_ENDERCHEST); + PiglinAi.angerNearbyPiglins(player, true); +@@ -105,6 +105,35 @@ public class EnderChestBlock extends AbstractChestBlock i } } diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0013-AFK-API.patch index 7a40a3111..cc51f5d4d 100644 --- a/patches/server/0013-AFK-API.patch +++ b/patches/server/0013-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 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce64015ea39b8 100644 +index be4226b968e02fa88deb851ecb76130034e56695..d4a05d40cb15b6b73d12976d3b25d71215dc04ea 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2367,8 +2367,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -2371,8 +2371,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); @@ -78,7 +78,7 @@ index 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce640 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 8345c9b767d9dabbaeb8bcc09cefd3a298759399..ba98e98a09e141d45bda8a663d5e4354e3afbc1e 100644 +index cc801cbefbbb54b8f9fa29bb37c00eca8e7ae44b..41f57991c9b42ee71d480f7f04a9007ae6a1d2d4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -332,6 +332,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 34b12d1b4..9c45085d3 100644 --- a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f9d2cb898e8f19accf30de609b5f0b1ef17fa9c7..7899793cf22f79e4d1acbac052ee273e6b2ad12f 100644 +index 14df0de1e1abe154991c77319a73dbb3a709af80..aca60e21e7a191212d07a03a105fc4fb636359b2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -3033,4 +3033,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -3037,4 +3037,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/patches/server/0114-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0114-Option-for-chests-to-open-even-with-a-solid-block-on.patch index d06d82b2c..38643354f 100644 --- a/patches/server/0114-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0114-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for chests to open even with a solid block on top diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -index 8fbfd18b3caeed769396b3ffb1b1778b2f38edc0..dbfe8f5d4df244cb694b73ea8763628c5f2507a3 100644 +index 0b27baf10770cb3077c4e75da55209689d614513..485ea9892f257c6843db23bca43f9fdcd8fa1503 100644 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -@@ -343,6 +343,7 @@ public class ChestBlock extends AbstractChestBlock implements +@@ -342,6 +342,7 @@ public class ChestBlock extends AbstractChestBlock implements } public static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) { diff --git a/patches/server/0115-Implement-TPSBar.patch b/patches/server/0115-Implement-TPSBar.patch index 1c93fa29d..7be5e90f3 100644 --- a/patches/server/0115-Implement-TPSBar.patch +++ b/patches/server/0115-Implement-TPSBar.patch @@ -41,7 +41,7 @@ index ca9afa93a9c43208ef64f86d534e5540d34a6b09..e0f7c6fa2a545d54135da6357440b79a } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c61d3d184 100644 +index 0b57d9a2e2573bdb41c9e163d953130c3a4a1747..6100c35a54a9f597bb7e4925bf2c63aa7e0d64d3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -68,7 +68,7 @@ index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -3063,5 +3066,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -3067,5 +3070,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to); } } @@ -83,7 +83,7 @@ index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c // Purpur end } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 105688ba795676a0612969f89668c9c8bda48f54..8b02ceeb89286c09ece26054ebe70a61c296dfd6 100644 +index d13270623d0630f94c7911bd8a544f1ee9449b17..cac3aa0308b4f9a4c563840f974651d20bdf195f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -480,6 +480,7 @@ public abstract class PlayerList { diff --git a/patches/server/0140-Sneak-to-bulk-process-composter.patch b/patches/server/0140-Sneak-to-bulk-process-composter.patch index 0f8467e47..d0e6f587e 100644 --- a/patches/server/0140-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0140-Sneak-to-bulk-process-composter.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index cc01ead133cc6859ca5d7a1d0ac3c12955e590da..9c035bfd8c75561886d5ff63f1df4acca6f71595 100644 +index ee9e4521079137d7b72194e8789810e7a89b8e75..09ab1904ea9c587f365513150dafe434a0b56ccf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -578,7 +578,7 @@ public class ServerPlayerGameMode { +@@ -577,7 +577,7 @@ public class ServerPlayerGameMode { ItemStack itemstack1 = stack.copy(); InteractionResult enuminteractionresult; diff --git a/patches/server/0190-Add-compass-command.patch b/patches/server/0190-Add-compass-command.patch index fff417dfe..8b3d8ba30 100644 --- a/patches/server/0190-Add-compass-command.patch +++ b/patches/server/0190-Add-compass-command.patch @@ -17,7 +17,7 @@ index 9f86a0397c0b64cb31dad245e2dc84d0fadd42d7..a66e2d78722847dec4e9d4aba8e6968e if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a54b89a9be5e9712e991a03ed33c4051656de513..552c4baba3d4562afdc1b253f6949371b654edac 100644 +index d1d1ceabdf6b0bd254fefd64e2504f0865e0c9b2..996bfac666762096fe322e54c2134bab0c08c950 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -304,6 +304,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -44,7 +44,7 @@ index a54b89a9be5e9712e991a03ed33c4051656de513..552c4baba3d4562afdc1b253f6949371 } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -3088,5 +3091,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -3092,5 +3095,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple public void tpsBar(boolean tpsBar) { this.tpsBar = tpsBar; } diff --git a/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch index e492223c6..d9bfbd8bb 100644 --- a/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Shift right click to use exp for mending diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index fe734df8b4521101c3e55c042957a531b3bdf945..7c06b284a6cc74c0b31f8921706c7796dcc4e402 100644 +index d3c49951c0bd7db4352326d3113f0ca9da393fab..28731f0c5b0ba63fa8d5ce3ee580bf314a844f92 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -518,6 +518,7 @@ public class ServerPlayerGameMode { @@ -16,7 +16,7 @@ index fe734df8b4521101c3e55c042957a531b3bdf945..7c06b284a6cc74c0b31f8921706c7796 BlockPos blockposition = hitResult.getBlockPos(); BlockState iblockdata = world.getBlockState(blockposition); boolean cancelledBlock = false; -@@ -627,4 +628,18 @@ public class ServerPlayerGameMode { +@@ -626,4 +627,18 @@ public class ServerPlayerGameMode { public void setLevel(ServerLevel world) { this.level = world; } @@ -36,7 +36,7 @@ index fe734df8b4521101c3e55c042957a531b3bdf945..7c06b284a6cc74c0b31f8921706c7796 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 747da684de2611e56c58617c2cf42547796c9660..0dadf75aa1b9c245127d00ea90144e54f8700ff1 100644 +index d806f43e76d15da500c1c04392aad483ddcd8a9a..636c9a47585890d6c6c609e491f0d17be4bf52c7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2075,6 +2075,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0243-Stonecutter-damage.patch b/patches/server/0243-Stonecutter-damage.patch index d2a32291d..a78b08cc5 100644 --- a/patches/server/0243-Stonecutter-damage.patch +++ b/patches/server/0243-Stonecutter-damage.patch @@ -83,10 +83,10 @@ index da790aac3bd8981f351b7e241015ff42bd0da73b..d143bba490bfb677361ab82c44f0f31a public DamageSource inFire() { diff --git a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java -index c6ecb378d0cb2ac05b8f22f92fb85df060038f77..b0199a8ffb1ea4cafeadedb8b833063db177b3cd 100644 +index 59fd521cd1e1101e2adce9830c43784e05abccdd..ff04b4ed1f4e2e6ca2286243d4faaa9b8edcc7cc 100644 --- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java +++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java -@@ -98,4 +98,14 @@ public class StonecutterBlock extends Block { +@@ -97,4 +97,14 @@ public class StonecutterBlock extends Block { protected boolean isPathfindable(BlockState state, PathComputationType type) { return false; } diff --git a/patches/server/0251-Add-local-difficulty-api.patch b/patches/server/0251-Add-local-difficulty-api.patch index d06cc5878..59ed18efb 100644 --- a/patches/server/0251-Add-local-difficulty-api.patch +++ b/patches/server/0251-Add-local-difficulty-api.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ffd284f0e25c6f20672f7225aafd37e6c87ccf03..eeeb4452956737056ecd9edcd9e9b825b2ad0fa6 100644 +index 90d4834f97d3ba996d46493246b1947511553424..0b25e57656e209508953fbbacd25a1e9036cf9fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2333,6 +2333,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2343,6 +2343,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); } diff --git a/patches/server/0257-Debug-Marker-API.patch b/patches/server/0257-Debug-Marker-API.patch index 5637545a1..a0c23cef3 100644 --- a/patches/server/0257-Debug-Marker-API.patch +++ b/patches/server/0257-Debug-Marker-API.patch @@ -52,10 +52,10 @@ index cac4b62cc3ab9e726b8c3ee62bdaca3410c07298..2acc914e31bcba0e570725dc4dc8449d @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index eeeb4452956737056ecd9edcd9e9b825b2ad0fa6..744e8486454b783697fb28f5441d0002d877a9b1 100644 +index 0b25e57656e209508953fbbacd25a1e9036cf9fd..668c55277cefbfdbdd7255bc3d3975f4c1250769 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2337,6 +2337,42 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2347,6 +2347,42 @@ public class CraftWorld extends CraftRegionAccessor implements World { public float getLocalDifficultyAt(Location location) { return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty(); } diff --git a/patches/server/0262-Implement-ram-and-rambar-commands.patch b/patches/server/0262-Implement-ram-and-rambar-commands.patch index 588ef43bd..34053984f 100644 --- a/patches/server/0262-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0262-Implement-ram-and-rambar-commands.patch @@ -18,7 +18,7 @@ index 24cb04cd33cfe578286c85a892b20bbf3fc843e6..8468452ff61f226b65be1dad21b627f2 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b3ed44884b7faa284effba5d257061be7fe72d2d..ceb9c794345922772a69a867a96531167e881d24 100644 +index d8bff9a83c4c2ad1ec1e7d44aac23068f6dc930b..4f72ce384f4c0dbae98effa89aed5c3bb802e635 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -305,6 +305,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -45,7 +45,7 @@ index b3ed44884b7faa284effba5d257061be7fe72d2d..ceb9c794345922772a69a867a9653116 nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur } -@@ -3100,5 +3103,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -3104,5 +3107,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple public void compassBar(boolean compassBar) { this.compassBar = compassBar; }