fix

MohistMC · Feb 2, 2024 · 4fbba37 · 4fbba37
1 parent e511738
commit 4fbba37
Show file tree

Hide file tree

Showing 3 changed files with 2,036 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -267,6 +267,10 @@ remapSpigotJar {
 	excludes.add('org/bukkit/craftbukkit/v1_20_R3/command/ColouredConsoleSender')
 	excludes.add('org/bukkit/craftbukkit/v1_20_R3/util/ServerShutdownThread')
 	excludes.add('org/bukkit/craftbukkit/v1_20_R3/util/TerminalConsoleWriterThread')
+	excludes.add('org/bukkit/craftbukkit/v1_20_R3/CraftWorld.class')
+	excludes.add('org/bukkit/craftbukkit/v1_20_R3/CraftWorld$1.class')
+	excludes.add('org/bukkit/craftbukkit/v1_20_R3/CraftWorld$2.class')
+	excludes.add('org/bukkit/craftbukkit/v1_20_R3/CraftWorld$3.class')
 	excludesApi.add('org/bukkit/event/block/BlockCookEvent.class')
 	excludesApi.add('org/bukkit/event/Event$Result.class')
 	excludesApi.add('org/bukkit/plugin/java/JavaPluginLoader$1.class')

diff --git a/src/main/java/com/mohistmc/banner/mixin/BannerMixinPlugin.java b/src/main/java/com/mohistmc/banner/mixin/BannerMixinPlugin.java
@@ -89,16 +89,6 @@ public class BannerMixinPlugin implements IMixinConfigPlugin {
                                             new MethodNode(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "bindPlayerMobs", "Lnet/minecraft/world/InteractionResult;", "Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/InteractionHand;", null)
                                     )
                             ))
-                    .put("net.minecraft.server.level.TicketType",
-                            Maps.immutableEntry(
-                                    ImmutableList.of(
-                                            new FieldNode(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL, "PLUGIN",
-                                                    "Lnet/minecraft/server/level/TicketType;", null, null),
-                                            new FieldNode(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL, "PLUGIN_TICKET",
-                                                    "Lnet/minecraft/server/level/TicketType;", null, null)
-                                    ),
-                                    ImmutableList.of()
-                            ))
                     .build();
 
     @Override