From c8f6e4f4ec39c6758fc69ffccc20115356f2b851 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 4 Aug 2024 13:23:47 +0800 Subject: [PATCH] Update anvil code --- .../citizensnpcs/nms/v1_21_R1/util/NMSImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java index 0613f800d..fbcaacecc 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java @@ -36,7 +36,7 @@ import org.bukkit.craftbukkit.v1_21_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_21_R1.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventoryAnvil; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v1_21_R1.inventory.view.CraftAnvilView; import org.bukkit.entity.EntityType; import org.bukkit.entity.FishHook; import org.bukkit.entity.Player; @@ -1202,7 +1202,7 @@ public class NMSImpl implements NMSBridge { ServerPlayer handle = (ServerPlayer) getHandle(player); final AnvilMenu container = new AnvilMenu(handle.nextContainerCounter(), handle.getInventory(), ContainerLevelAccess.create(handle.level(), new BlockPos(0, 0, 0))) { - private CraftInventoryView bukkitEntity; + private CraftAnvilView bukkitEntity; @Override protected void clearContainer(net.minecraft.world.entity.player.Player entityhuman, Container iinventory) { @@ -1215,12 +1215,10 @@ public class NMSImpl implements NMSBridge { } @Override - public CraftInventoryView getBukkitView() { + public CraftAnvilView getBukkitView() { if (this.bukkitEntity == null) { - this.bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(), - new CitizensInventoryAnvil(this.access.getLocation(), this.inputSlots, this.resultSlots, - this, anvil), - this); + this.bukkitEntity = new CraftAnvilView(this.player.getBukkitEntity(), new CitizensInventoryAnvil( + this.access.getLocation(), this.inputSlots, this.resultSlots, this, anvil), this); } return this.bukkitEntity; } @@ -1927,7 +1925,7 @@ public class NMSImpl implements NMSBridge { public CitizensInventoryAnvil(Location location, Container inventory, Container resultInventory, AnvilMenu container, Inventory wrapped) { - super(location, inventory, resultInventory, container); + super(location, inventory, resultInventory); this.wrapped = wrapped; }