From f96b6ad02097fe65a98afa29cd9166962638cbaa Mon Sep 17 00:00:00 2001 From: Mark Date: Sat, 31 Jan 2026 18:54:44 +0300 Subject: [PATCH] remove "sendOpenGuiNoDelay" method it is completely equivalent to "sendOpenGui" --- .../java/noppes/npcs/NoppesUtilServer.java | 27 ------------------- .../java/noppes/npcs/items/ItemNpcWand.java | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 0799e7a6c..684222526 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -341,11 +341,6 @@ public class NoppesUtilServer { sendOpenGui(player, gui, npc, 0, 0, 0); } - public static void sendOpenGuiNoDelay(EntityPlayer player, - EnumGuiType gui, EntityNPCInterface npc) { - sendOpenGuiNoDelay(player, gui, npc, 0, 0, 0); - } - public static void sendOpenGui(final EntityPlayer player, final EnumGuiType gui, final EntityNPCInterface npc, final int i, final int j, final int k) { if (!(player instanceof EntityPlayerMP)) @@ -367,28 +362,6 @@ public class NoppesUtilServer { ScrollListPacket.sendList((EntityPlayerMP) player, list, EnumScrollData.OPTIONAL); } - public static void sendOpenGuiNoDelay(final EntityPlayer player, - final EnumGuiType gui, final EntityNPCInterface npc, final int i, final int j, final int k) { - if (!(player instanceof EntityPlayerMP)) - return; - - setEditingNpc(player, npc); - sendExtraData(player, npc, gui, i, j, k); - - if (CustomNpcs.proxy.getServerGuiElement(gui.ordinal(), player, player.worldObj, i, j, k) != null) { - player.openGui(CustomNpcs.instance, gui.ordinal(), player.worldObj, i, j, k); - return; - } else { - GuiOpenPacket.openGUI((EntityPlayerMP) player, gui, i, j, k); - } - ArrayList list = getScrollData(player, gui, npc); - if (list == null || list.isEmpty()) - return; - - ScrollListPacket.sendList((EntityPlayerMP) player, list, EnumScrollData.OPTIONAL); - } - - private static void sendExtraData(EntityPlayer player, EntityNPCInterface npc, EnumGuiType gui, int i, int j, int k) { if (gui == EnumGuiType.PlayerFollower || gui == EnumGuiType.PlayerFollowerHire || gui == EnumGuiType.PlayerTrader || gui == EnumGuiType.PlayerTransporter) { sendRoleData(player, npc); diff --git a/src/main/java/noppes/npcs/items/ItemNpcWand.java b/src/main/java/noppes/npcs/items/ItemNpcWand.java index 1a11918ae..d36a81fce 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcWand.java +++ b/src/main/java/noppes/npcs/items/ItemNpcWand.java @@ -53,7 +53,7 @@ public class ItemNpcWand extends Item { par3World.spawnEntityInWorld(npc); npc.setHealth(npc.getMaxHealth()); - NoppesUtilServer.sendOpenGuiNoDelay(player, EnumGuiType.MainMenuDisplay, npc); + NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc); return true; } else player.addChatMessage(new ChatComponentTranslation("availability.permission"));