From 3c5bf59821584fa9f1fba512c8892182ed02733b Mon Sep 17 00:00:00 2001 From: APickledWalrus Date: Sat, 4 Jun 2022 02:07:08 -0400 Subject: [PATCH] Optimizations --- .../java/io/github/apickledwalrus/skriptgui/gui/GUI.java | 5 +---- .../io/github/apickledwalrus/skriptgui/gui/GUIManager.java | 2 +- .../apickledwalrus/skriptgui/gui/events/GUIEvents.java | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUI.java b/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUI.java index e37f9ec..901418f 100644 --- a/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUI.java +++ b/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUI.java @@ -191,12 +191,9 @@ private void changeInventory(int size, @Nullable String name) { if (size >= inventory.getSize()) { newInventory.setContents(inventory.getContents()); } else { // The inventory is shrinking - ItemStack[] oldContents = inventory.getContents(); - ItemStack[] contents = new ItemStack[size]; for (int slot = 0; slot < size; slot++) { - contents[slot] = oldContents[slot]; + newInventory.setItem(slot, inventory.getItem(slot)); } - newInventory.setContents(contents); } eventHandler.pause(); // Don't process any events as we transfer data and players diff --git a/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUIManager.java b/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUIManager.java index 27fd1cd..90af1e7 100644 --- a/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUIManager.java +++ b/src/main/java/io/github/apickledwalrus/skriptgui/gui/GUIManager.java @@ -108,7 +108,7 @@ public boolean hasGUI(Player player) { @Nullable public GUI getGUI(String id) { for (GUI gui : guis) { - if (gui.getID() != null && gui.getID().equals(id)) { + if (id.equals(gui.getID())) { return gui; } } diff --git a/src/main/java/io/github/apickledwalrus/skriptgui/gui/events/GUIEvents.java b/src/main/java/io/github/apickledwalrus/skriptgui/gui/events/GUIEvents.java index 75c9d44..68a5499 100644 --- a/src/main/java/io/github/apickledwalrus/skriptgui/gui/events/GUIEvents.java +++ b/src/main/java/io/github/apickledwalrus/skriptgui/gui/events/GUIEvents.java @@ -3,7 +3,6 @@ import ch.njol.skript.SkriptEventHandler; import io.github.apickledwalrus.skriptgui.SkriptGUI; import io.github.apickledwalrus.skriptgui.gui.GUI; -import io.github.apickledwalrus.skriptgui.gui.GUI.SlotData; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority;