diff options
author | Jake Potrebic <[email protected]> | 2023-06-08 21:29:58 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2023-06-08 21:29:58 -0700 |
commit | 82c64790f43239051625385e3e72b26fe17626e1 (patch) | |
tree | 69567a33f5307dc8dd09e2d44c1e91b47214667e /patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch | |
parent | e829a9d8f3a52a4803eaaa96a046c4a4876a262a (diff) | |
download | Paper-82c64790f43239051625385e3e72b26fe17626e1.tar.gz Paper-82c64790f43239051625385e3e72b26fe17626e1.zip |
Add back Anti-Xray patch (#9283)
Diffstat (limited to 'patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch')
-rw-r--r-- | patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch deleted file mode 100644 index 793883a2f4..0000000000 --- a/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder <[email protected]> -Date: Mon, 19 Sep 2022 00:13:02 +0100 -Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type - change - -TODO: Remove in 1.21? - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index cacd9b59741c31e70e898e7af91a1a6ed3f87f07..2ee82c316c3a6a79e1d722dfd00c22baa83c0299 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -@@ -466,6 +466,12 @@ public class Commodore - super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, CB_PACKAGE + "/advancement/CraftAdvancement", "getDisplay0", desc, false); - return; - } -+ if (owner.equals("org/bukkit/WorldCreator") && name.equals("keepSpawnLoaded") && desc.equals("(Lnet/kyori/adventure/util/TriState;)V")) { -+ super.visitMethodInsn(opcode, owner, name, "(Lnet/kyori/adventure/util/TriState;)Lorg/bukkit/WorldCreator;", itf); -+ // new method has a return, so, make sure we pop it -+ super.visitInsn(Opcodes.POP); -+ return; -+ } - // Paper end - if ( modern ) - { |