From 8250199f2b623cc37d709e82e9717e6572e0e538 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 Sep 2021 14:52:24 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: https://github.com/PaperMC/Paper/commit/85ffdc4389da98c74204cfc4dfacbbd6d45fc9f5 Updated Upstream (CraftBukkit) https://github.com/PaperMC/Paper/commit/f6a1cb21c58bc75683724dfe5028715ded0b54f8 Do not process entity loads in CraftChunk#getEntities (Fixes #6543) https://github.com/PaperMC/Paper/commit/5c7da5536b445747a2af7f012c93c8d92c4367cb Prevent an infinite recursion error while rendering translatables (Fixes #6551) (#6555) https://github.com/PaperMC/Paper/commit/cc6fd371b2d1ab2ad1df85789b143f04a17c1468 Remove "Auto fix bad Y levels on player login" patch https://github.com/PaperMC/Paper/commit/3562558d62d25c95b5624a3cd635a8f9c76eab43 Prevent softlocked end exit portal generation (#6525) https://github.com/PaperMC/Paper/commit/6fa1983e9ce177a4a412d5b950fd978620174777 Use BlockPost#atY in end portal softlock fix --- gradle.properties | 2 +- .../server/0006-Component-related-conveniences.patch | 4 ++-- patches/server/0007-Ridables.patch | 6 +++--- patches/server/0013-AFK-API.patch | 4 ++-- patches/server/0021-Player-invulnerabilities.patch | 12 ++++++------ patches/server/0025-Silk-touch-spawners.patch | 4 ++-- patches/server/0048-Signs-allow-color-codes.patch | 4 ++-- .../0050-Minecart-settings-and-WASD-controls.patch | 4 ++-- ...n-to-teleport-to-spawn-if-outside-world-bor.patch | 4 ++-- .../server/0130-Add-boat-fall-damage-config.patch | 4 ++-- patches/server/0141-Implement-TPSBar.patch | 10 +++++----- patches/server/0152-Fix-stuck-in-portals.patch | 4 ++-- ...-Config-to-ignore-nearby-mobs-when-sleeping.patch | 4 ++-- .../0190-Configurable-broadcast-settings.patch | 6 +++--- patches/server/0234-Add-compass-command.patch | 8 ++++---- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gradle.properties b/gradle.properties index 32dc4c64f..3a64bc74e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = 20903fcf5e227a1a03e2afd89f01bfe951b2b328 +paperCommit = 6fa1983e9ce177a4a412d5b950fd978620174777 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch index 5278c8bfc..de6b2de16 100644 --- a/patches/server/0006-Component-related-conveniences.patch +++ b/patches/server/0006-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 a471d30e8cc289e750db32a343f7d21a589dd1b8..3becbc139ea6510ecc7e6e160620b8fa3b66dc46 100644 +index 1ee3a4fb960129ba4dae441ad3a4c0217be29972..4d54d474f7d5cc4b3e1530876aa18b916ce4f72c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1680,6 +1680,26 @@ public class ServerPlayer extends Player { +@@ -1679,6 +1679,26 @@ public class ServerPlayer extends Player { } // CraftBukkit end diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch index bd4a908e4..655b482bc 100644 --- a/patches/server/0007-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -46,10 +46,10 @@ index d743d50a9b3ad9502fc11adc6fe43e9a58d7a94b..372eea42755cad6bf957fa94b816db25 return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3becbc139ea6510ecc7e6e160620b8fa3b66dc46..6ea2657daf537a0aa75aa5e5c03fca9610c01f7e 100644 +index 4d54d474f7d5cc4b3e1530876aa18b916ce4f72c..d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -665,6 +665,15 @@ public class ServerPlayer extends Player { +@@ -664,6 +664,15 @@ public class ServerPlayer extends Player { } this.advancements.flushDirty(this); @@ -65,7 +65,7 @@ index 3becbc139ea6510ecc7e6e160620b8fa3b66dc46..6ea2657daf537a0aa75aa5e5c03fca96 } public void doTick() { -@@ -2441,4 +2450,6 @@ public class ServerPlayer extends Player { +@@ -2440,4 +2449,6 @@ public class ServerPlayer extends Player { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0013-AFK-API.patch index e35e48d70..e9427ddd4 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 6ea2657daf537a0aa75aa5e5c03fca9610c01f7e..19ac7822b4e1c4f1a21600c5e31f971eb87f839f 100644 +index d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825..04d2e4e641c12fb259ee7758db81b3544193a2df 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1955,8 +1955,58 @@ public class ServerPlayer extends Player { +@@ -1954,8 +1954,58 @@ public class ServerPlayer extends Player { public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); diff --git a/patches/server/0021-Player-invulnerabilities.patch b/patches/server/0021-Player-invulnerabilities.patch index 7947896ef..51e521b02 100644 --- a/patches/server/0021-Player-invulnerabilities.patch +++ b/patches/server/0021-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ 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 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f31508951 100644 +index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863da1df6127 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -259,6 +259,7 @@ public class ServerPlayer extends Player { @@ -24,7 +24,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f } // Paper start - Chunk priority public BlockPos getPointInFront(double inFront) { -@@ -978,6 +980,12 @@ public class ServerPlayer extends Player { +@@ -977,6 +979,12 @@ public class ServerPlayer extends Player { } @@ -37,7 +37,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f @Override public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { -@@ -985,7 +993,7 @@ public class ServerPlayer extends Player { +@@ -984,7 +992,7 @@ public class ServerPlayer extends Player { } else { boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId); @@ -46,7 +46,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f return false; } else { if (source instanceof EntityDamageSource) { -@@ -1160,6 +1168,7 @@ public class ServerPlayer extends Player { +@@ -1159,6 +1167,7 @@ public class ServerPlayer extends Player { } // Paper end @@ -54,7 +54,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f return this; } } -@@ -1945,6 +1954,7 @@ public class ServerPlayer extends Player { +@@ -1944,6 +1953,7 @@ public class ServerPlayer extends Player { } public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) { @@ -62,7 +62,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt)); } -@@ -2451,9 +2461,17 @@ public class ServerPlayer extends Player { +@@ -2450,9 +2460,17 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { diff --git a/patches/server/0025-Silk-touch-spawners.patch b/patches/server/0025-Silk-touch-spawners.patch index 4812db723..3f69a17f6 100644 --- a/patches/server/0025-Silk-touch-spawners.patch +++ b/patches/server/0025-Silk-touch-spawners.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Silk touch spawners diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -index 41762b5ed19b17ee524f79726eaa4cf38479ba96..9054268a0cf54b53f24084f304a3ef75ef17a16e 100644 +index f763a3ea5796737304e0c1f41349622e1d7adadf..26c5c3c6e7c51ad6ccc9bac05e2af4972658179d 100644 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -@@ -85,6 +85,7 @@ public final class PaperAdventure { +@@ -91,6 +91,7 @@ public final class PaperAdventure { }) .build(); public static final LegacyComponentSerializer LEGACY_SECTION_UXRC = LegacyComponentSerializer.builder().flattener(FLATTENER).hexColors().useUnusualXRepeatedCharacterHexFormat().build(); diff --git a/patches/server/0048-Signs-allow-color-codes.patch b/patches/server/0048-Signs-allow-color-codes.patch index 5c749efd5..d2a01efa4 100644 --- a/patches/server/0048-Signs-allow-color-codes.patch +++ b/patches/server/0048-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 ac0e43ed7f3385eb89e9b6e80f169b1f31508951..1196de6eab3c621e8f165b9431576fa267787404 100644 +index dafb9dcb3199f217e910a0cd969b863da1df6127..b1e1ea0ec16f3fc9b83b8d000024e731e48c7401 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1464,6 +1464,7 @@ public class ServerPlayer extends Player { +@@ -1463,6 +1463,7 @@ public class ServerPlayer extends Player { @Override public void openTextEdit(SignBlockEntity sign) { diff --git a/patches/server/0050-Minecart-settings-and-WASD-controls.patch b/patches/server/0050-Minecart-settings-and-WASD-controls.patch index f5ce857f8..1028f035c 100644 --- a/patches/server/0050-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0050-Minecart-settings-and-WASD-controls.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1196de6eab3c621e8f165b9431576fa267787404..af5c80da6c1c2a4ef49b3e9ef15b6f67cfe479a9 100644 +index b1e1ea0ec16f3fc9b83b8d000024e731e48c7401..5f974fec242181729340b6c353dc6b17c3f73837 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -991,6 +991,7 @@ public class ServerPlayer extends Player { +@@ -990,6 +990,7 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index f19d28054..f6228add6 100644 --- a/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0085-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 af5c80da6c1c2a4ef49b3e9ef15b6f67cfe479a9..f688693ae25999bdbb2a7bf402fdfffd3f62795a 100644 +index 5f974fec242181729340b6c353dc6b17c3f73837..bfcd520f5186e61ff601de27aa10b25cf3deea13 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2521,5 +2521,25 @@ public class ServerPlayer extends Player { +@@ -2520,5 +2520,25 @@ public class ServerPlayer extends Player { } // CraftBukkit end diff --git a/patches/server/0130-Add-boat-fall-damage-config.patch b/patches/server/0130-Add-boat-fall-damage-config.patch index b83191ac8..307c89be0 100644 --- a/patches/server/0130-Add-boat-fall-damage-config.patch +++ b/patches/server/0130-Add-boat-fall-damage-config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f688693ae25999bdbb2a7bf402fdfffd3f62795a..a78d1068802c98d888fe2e139a327a089a2b2bf8 100644 +index bfcd520f5186e61ff601de27aa10b25cf3deea13..708544ba328bab7a5eb9f4860eccb32258c6ee04 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -991,7 +991,16 @@ public class ServerPlayer extends Player { +@@ -990,7 +990,16 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0141-Implement-TPSBar.patch b/patches/server/0141-Implement-TPSBar.patch index cc86cdde4..4898084da 100644 --- a/patches/server/0141-Implement-TPSBar.patch +++ b/patches/server/0141-Implement-TPSBar.patch @@ -42,7 +42,7 @@ index ef0d4086af9a05bf5f0dd1eae965e496b1de6199..c7db9d6357935c6004867ded2b422f8a } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6 100644 +index 708544ba328bab7a5eb9f4860eccb32258c6ee04..33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -260,6 +260,7 @@ public class ServerPlayer extends Player { @@ -53,7 +53,7 @@ index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper -@@ -482,6 +483,7 @@ public class ServerPlayer extends Player { +@@ -481,6 +482,7 @@ public class ServerPlayer extends Player { } } @@ -61,7 +61,7 @@ index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be } @Override -@@ -542,6 +544,7 @@ public class ServerPlayer extends Player { +@@ -541,6 +543,7 @@ public class ServerPlayer extends Player { } this.getBukkitEntity().setExtraData(nbt); // CraftBukkit @@ -69,7 +69,7 @@ index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2550,5 +2553,13 @@ public class ServerPlayer extends Player { +@@ -2549,5 +2552,13 @@ public class ServerPlayer extends Player { this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck); } } @@ -105,7 +105,7 @@ index e17c61e3b807dbc1a7bca4952349145617204154..cf016f139895690d5a0e0ef2709e31ea entityplayer.awardStat(Stats.LEAVE_GAME); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 8323b10a6ab17f56c6e5d1ad2cee9ebc7ad403de..e4e5b2cef7bcbb4e9411f78aefbdf2486e1658e8 100644 +index 9494d94abbe352d275ed39070dbc59d8650a0ed7..16a7808f0ad010240db8a33eccc61b623ccd3d76 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -209,6 +209,29 @@ public class PurpurConfig { diff --git a/patches/server/0152-Fix-stuck-in-portals.patch b/patches/server/0152-Fix-stuck-in-portals.patch index 72e3015b6..170d2007a 100644 --- a/patches/server/0152-Fix-stuck-in-portals.patch +++ b/patches/server/0152-Fix-stuck-in-portals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6..4a201004d397cf960822259d4f7d19cf53d28cf7 100644 +index 33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee..64c5a9900121ee5c369affa723de2c5f3433bc29 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1144,6 +1144,7 @@ public class ServerPlayer extends Player { +@@ -1143,6 +1143,7 @@ public class ServerPlayer extends Player { playerlist.sendPlayerPermissionLevel(this); worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION); this.unsetRemoved(); diff --git a/patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch index 7052e8ce6..936adec2f 100644 --- a/patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4a201004d397cf960822259d4f7d19cf53d28cf7..b0bbd09379e451798b3fa965c2c61ad029faea5b 100644 +index 64c5a9900121ee5c369affa723de2c5f3433bc29..f83e5b3ee2489b4dd35f856a1262972939eb71cf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1307,7 +1307,7 @@ public class ServerPlayer extends Player { +@@ -1306,7 +1306,7 @@ public class ServerPlayer extends Player { return entitymonster.isPreventingPlayerRest((Player) this); }); diff --git a/patches/server/0190-Configurable-broadcast-settings.patch b/patches/server/0190-Configurable-broadcast-settings.patch index 4e45d4c17..1af1440a9 100644 --- a/patches/server/0190-Configurable-broadcast-settings.patch +++ b/patches/server/0190-Configurable-broadcast-settings.patch @@ -17,10 +17,10 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b0bbd09379e451798b3fa965c2c61ad029faea5b..d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a 100644 +index f83e5b3ee2489b4dd35f856a1262972939eb71cf..b599607d616f9faf209f1a4491dd3fcfd49a6126 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -882,6 +882,7 @@ public class ServerPlayer extends Player { +@@ -881,6 +881,7 @@ public class ServerPlayer extends Player { }); Team scoreboardteambase = this.getTeam(); @@ -29,7 +29,7 @@ index b0bbd09379e451798b3fa965c2c61ad029faea5b..d4b9a31fb3a26a8939e1d30f5b6bc2d6 if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 420a3fb44eb50147d070953b7107517baa4e5df9..ae258c4eaa402cc246d7a7052965ce06c58554f0 100644 +index 7e74166e12c114330a99365440d09ee7eb6023dc..ffa8fc634e46e5bbd2f97fb4d1167cacd82b3164 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,6 +178,18 @@ public class PurpurConfig { diff --git a/patches/server/0234-Add-compass-command.patch b/patches/server/0234-Add-compass-command.patch index d4d214dd8..e5bb79366 100644 --- a/patches/server/0234-Add-compass-command.patch +++ b/patches/server/0234-Add-compass-command.patch @@ -17,7 +17,7 @@ index 48a70900082c6c2c99c955a6ac40b48859a74979..8c2424b0917d278bb0b9e687d116d8de 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 d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c6ca58ad7 100644 +index b599607d616f9faf209f1a4491dd3fcfd49a6126..0cb58f2a5607664193adddbfd7e43384c5a44862 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -261,6 +261,7 @@ public class ServerPlayer extends Player { @@ -28,7 +28,7 @@ index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper -@@ -484,6 +485,7 @@ public class ServerPlayer extends Player { +@@ -483,6 +484,7 @@ public class ServerPlayer extends Player { } if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur @@ -36,7 +36,7 @@ index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c } @Override -@@ -545,6 +547,7 @@ public class ServerPlayer extends Player { +@@ -544,6 +546,7 @@ public class ServerPlayer extends Player { this.getBukkitEntity().setExtraData(nbt); // CraftBukkit nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur @@ -44,7 +44,7 @@ index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2563,5 +2566,13 @@ public class ServerPlayer extends Player { +@@ -2562,5 +2565,13 @@ public class ServerPlayer extends Player { public void tpsBar(boolean tpsBar) { this.tpsBar = tpsBar; }