From c8fb92aa1c93d532240aa555fd3ae614b2d24167 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Mon, 5 Dec 2022 07:43:44 -0600 Subject: [PATCH] Drop our player entity track event due to upstream update? --- ...-Set-multiple-Team-settings-at-once.patch} | 0 ...orts.patch => 0010-Smooth-Teleports.patch} | 2 +- ...ch => 0011-Equipment-Packet-Caching.patch} | 0 patches/api/0012-AntiXray-Bypass.patch | 21 ++++++++ ...tch => 0013-PlayerPreChunkLoadEvent.patch} | 0 ...-Set-multiple-Team-settings-at-once.patch} | 0 ...orts.patch => 0016-Smooth-Teleports.patch} | 4 +- ...=> 0017-Allow-access-to-LightEngine.patch} | 2 +- ...tch => 0018-Unfreeze-MappedRegistry.patch} | 0 ...ch => 0019-Equipment-Packet-Caching.patch} | 2 +- patches/server/0020-AntiXray-Bypass.patch | 48 +++++++++++++++++++ ...tch => 0021-PlayerPreChunkLoadEvent.patch} | 0 ...=> 0022-Shared-DataStorage-for-maps.patch} | 0 ...TTON-nutrition-equal-to-COOKED_BEEF.patch} | 0 14 files changed, 74 insertions(+), 5 deletions(-) rename patches/api/{0010-Set-multiple-Team-settings-at-once.patch => 0009-Set-multiple-Team-settings-at-once.patch} (100%) rename patches/api/{0011-Smooth-Teleports.patch => 0010-Smooth-Teleports.patch} (93%) rename patches/api/{0012-Equipment-Packet-Caching.patch => 0011-Equipment-Packet-Caching.patch} (100%) create mode 100644 patches/api/0012-AntiXray-Bypass.patch rename patches/api/{0014-PlayerPreChunkLoadEvent.patch => 0013-PlayerPreChunkLoadEvent.patch} (100%) rename patches/server/{0016-Set-multiple-Team-settings-at-once.patch => 0015-Set-multiple-Team-settings-at-once.patch} (100%) rename patches/server/{0017-Smooth-Teleports.patch => 0016-Smooth-Teleports.patch} (95%) rename patches/server/{0018-Allow-access-to-LightEngine.patch => 0017-Allow-access-to-LightEngine.patch} (91%) rename patches/server/{0019-Unfreeze-MappedRegistry.patch => 0018-Unfreeze-MappedRegistry.patch} (100%) rename patches/server/{0020-Equipment-Packet-Caching.patch => 0019-Equipment-Packet-Caching.patch} (99%) create mode 100644 patches/server/0020-AntiXray-Bypass.patch rename patches/server/{0022-PlayerPreChunkLoadEvent.patch => 0021-PlayerPreChunkLoadEvent.patch} (100%) rename patches/server/{0023-Shared-DataStorage-for-maps.patch => 0022-Shared-DataStorage-for-maps.patch} (100%) rename patches/server/{0024-Set-COOKED_MUTTON-nutrition-equal-to-COOKED_BEEF.patch => 0023-Set-COOKED_MUTTON-nutrition-equal-to-COOKED_BEEF.patch} (100%) diff --git a/patches/api/0010-Set-multiple-Team-settings-at-once.patch b/patches/api/0009-Set-multiple-Team-settings-at-once.patch similarity index 100% rename from patches/api/0010-Set-multiple-Team-settings-at-once.patch rename to patches/api/0009-Set-multiple-Team-settings-at-once.patch diff --git a/patches/api/0011-Smooth-Teleports.patch b/patches/api/0010-Smooth-Teleports.patch similarity index 93% rename from patches/api/0011-Smooth-Teleports.patch rename to patches/api/0010-Smooth-Teleports.patch index 6f64fb1d7..f0219ea0c 100644 --- a/patches/api/0011-Smooth-Teleports.patch +++ b/patches/api/0010-Smooth-Teleports.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Smooth Teleports diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ecb8b4cf48c7d6151ffec92bc6855d1fc57a2b51..593491cf755129f7e6a664cdab599a48390b0888 100644 +index 1e27b9de47f111b9c000243214e22890e323f7fc..39c65831f38b3992c52f35abcc4aab1d2e09473c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2763,6 +2763,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0012-Equipment-Packet-Caching.patch b/patches/api/0011-Equipment-Packet-Caching.patch similarity index 100% rename from patches/api/0012-Equipment-Packet-Caching.patch rename to patches/api/0011-Equipment-Packet-Caching.patch diff --git a/patches/api/0012-AntiXray-Bypass.patch b/patches/api/0012-AntiXray-Bypass.patch new file mode 100644 index 000000000..ea3e893cb --- /dev/null +++ b/patches/api/0012-AntiXray-Bypass.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Fri, 18 Nov 2022 08:03:20 -0600 +Subject: [PATCH] AntiXray Bypass + + +diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java +index 39c65831f38b3992c52f35abcc4aab1d2e09473c..8c101c66b2c8d7044d29474e37c10838ee3e5d0c 100644 +--- a/src/main/java/org/bukkit/entity/Player.java ++++ b/src/main/java/org/bukkit/entity/Player.java +@@ -2543,6 +2543,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + */ + boolean hasResourcePack(); + ++ // Slice start ++ void toggleAntiXrayBypass(boolean bypass); ++ // Slice end ++ + /** + * Gets a copy of this players profile + * @return The players profile object diff --git a/patches/api/0014-PlayerPreChunkLoadEvent.patch b/patches/api/0013-PlayerPreChunkLoadEvent.patch similarity index 100% rename from patches/api/0014-PlayerPreChunkLoadEvent.patch rename to patches/api/0013-PlayerPreChunkLoadEvent.patch diff --git a/patches/server/0016-Set-multiple-Team-settings-at-once.patch b/patches/server/0015-Set-multiple-Team-settings-at-once.patch similarity index 100% rename from patches/server/0016-Set-multiple-Team-settings-at-once.patch rename to patches/server/0015-Set-multiple-Team-settings-at-once.patch diff --git a/patches/server/0017-Smooth-Teleports.patch b/patches/server/0016-Smooth-Teleports.patch similarity index 95% rename from patches/server/0017-Smooth-Teleports.patch rename to patches/server/0016-Smooth-Teleports.patch index bb302749a..edac989ba 100644 --- a/patches/server/0017-Smooth-Teleports.patch +++ b/patches/server/0016-Smooth-Teleports.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Smooth Teleports diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3b122f521c166253f20d233c0fcebdede6660be5..1972c2d20f7d07488dbf89b1e742d234390dc08b 100644 +index 9c9b4d7e0637348a94befce9377fdb69c1239694..46ff63d0a2c05c67bcedccc2827120f088acd066 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -266,6 +266,7 @@ public class ServerPlayer extends Player { @@ -36,7 +36,7 @@ index 6f0efd3459da45e4aa3a59e8b647725b779cdf51..3b3a4d7b1e94c8a9be64e3423654a149 // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 46c3f5327adb2324a77c3576958cc91866960e7c..79badb82b2904c5d59840d747eedd84cd404b2dd 100644 +index 3c301c3621cfc3c99788064231af7e106f418e3b..fb2703bc25242fe82e989032175e138ffa0b46b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1216,6 +1216,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0018-Allow-access-to-LightEngine.patch b/patches/server/0017-Allow-access-to-LightEngine.patch similarity index 91% rename from patches/server/0018-Allow-access-to-LightEngine.patch rename to patches/server/0017-Allow-access-to-LightEngine.patch index bfeb23449..4a2c52833 100644 --- a/patches/server/0018-Allow-access-to-LightEngine.patch +++ b/patches/server/0017-Allow-access-to-LightEngine.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow access to LightEngine diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d1edafb3e44a4d17586e0e9c4fca30389b529074..16c79e70ed3d77554398c4c3ab4729756fe4777d 100644 +index 55d8ced734a408c990c6c4fbc81707bcb1f27daa..3fc426cb23ccf9baf922eca0aaca866cd1994cba 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -494,7 +494,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0019-Unfreeze-MappedRegistry.patch b/patches/server/0018-Unfreeze-MappedRegistry.patch similarity index 100% rename from patches/server/0019-Unfreeze-MappedRegistry.patch rename to patches/server/0018-Unfreeze-MappedRegistry.patch diff --git a/patches/server/0020-Equipment-Packet-Caching.patch b/patches/server/0019-Equipment-Packet-Caching.patch similarity index 99% rename from patches/server/0020-Equipment-Packet-Caching.patch rename to patches/server/0019-Equipment-Packet-Caching.patch index 55c1e4c39..cded02946 100644 --- a/patches/server/0020-Equipment-Packet-Caching.patch +++ b/patches/server/0019-Equipment-Packet-Caching.patch @@ -27,7 +27,7 @@ index 5a8f850b447fc3a4bd0eb0c505bbdfc8be7115e8..997c9656c9cf815ad2769d4dea6f67a2 this.entity = buf.readVarInt(); EquipmentSlot[] equipmentSlots = EquipmentSlot.values(); diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index e4b5c07b4f310832315711885726cfc4c01663c5..a0c6bb02fc3452c4d05c1e29f9d804f2eaf6b8b3 100644 +index 8b30e408d12ccabb66f94829879781e88023f271..52d021c87b40906a546678af6aa030843e6e669b 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -300,27 +300,8 @@ public class ServerEntity { diff --git a/patches/server/0020-AntiXray-Bypass.patch b/patches/server/0020-AntiXray-Bypass.patch new file mode 100644 index 000000000..be574de11 --- /dev/null +++ b/patches/server/0020-AntiXray-Bypass.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Fri, 18 Nov 2022 08:03:19 -0600 +Subject: [PATCH] AntiXray Bypass + + +diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java +index dabd93c35bdbac6a8b668a82d5f3d4173a1baa4a..3c144e41dbe5735fb72094281596e22e95eea082 100644 +--- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java ++++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java +@@ -162,6 +162,7 @@ public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockCo + + @Override + public boolean shouldModify(ServerPlayer player, LevelChunk chunk) { ++ if (player.getBukkitEntity().hasAntiXrayBypass()) return false; // Slice + return !usePermission || !player.getBukkitEntity().hasPermission("paper.antixray.bypass"); + } + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index fb2703bc25242fe82e989032175e138ffa0b46b4..83b4bc9238a8adbebfd0dd62b99075632e79281a 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -176,6 +176,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit + private long lastSaveTime; + // Paper end ++ private boolean antiXrayBypass; // Slice + + public CraftPlayer(CraftServer server, ServerPlayer entity) { + super(server, entity); +@@ -2596,6 +2597,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + } + // Paper end + ++ // Slice start ++ public boolean hasAntiXrayBypass() { ++ return this.antiXrayBypass; ++ } ++ ++ @Override ++ public void toggleAntiXrayBypass(boolean bypass) { ++ this.antiXrayBypass = bypass; ++ } ++ // Slice end ++ + @Override + public void updateCommands() { + if (this.getHandle().connection == null) return; diff --git a/patches/server/0022-PlayerPreChunkLoadEvent.patch b/patches/server/0021-PlayerPreChunkLoadEvent.patch similarity index 100% rename from patches/server/0022-PlayerPreChunkLoadEvent.patch rename to patches/server/0021-PlayerPreChunkLoadEvent.patch diff --git a/patches/server/0023-Shared-DataStorage-for-maps.patch b/patches/server/0022-Shared-DataStorage-for-maps.patch similarity index 100% rename from patches/server/0023-Shared-DataStorage-for-maps.patch rename to patches/server/0022-Shared-DataStorage-for-maps.patch diff --git a/patches/server/0024-Set-COOKED_MUTTON-nutrition-equal-to-COOKED_BEEF.patch b/patches/server/0023-Set-COOKED_MUTTON-nutrition-equal-to-COOKED_BEEF.patch similarity index 100% rename from patches/server/0024-Set-COOKED_MUTTON-nutrition-equal-to-COOKED_BEEF.patch rename to patches/server/0023-Set-COOKED_MUTTON-nutrition-equal-to-COOKED_BEEF.patch