From a009c841b149c0dfdfd6b03da63a43d8a0f08eac Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 1 Dec 2024 20:13:12 +0100 Subject: [PATCH] Fix: getOpenInventory --- .../features/simulator/gui/base/SimulatorBaseGui.java | 4 ++-- .../src/de/steamwar/core/TrickyTrialsWrapper21.java | 6 ++++++ .../src/de/steamwar/core/TrickyTrialsWrapper8.java | 6 ++++++ .../src/de/steamwar/core/TrickyTrialsWrapper.java | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java index 82c8dabb..65bee3de 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java @@ -55,7 +55,7 @@ public abstract class SimulatorBaseGui { inv.setItem(i, null); } setup(); - if (player.getOpenInventory().getTopInventory() != inv) { + if (TrickyTrialsWrapper.impl.getTopInventory(player.getOpenInventory()) != inv) { inventory.open(); SimulatorWatcher.watch(player, simulator, this::open); } @@ -63,7 +63,7 @@ public abstract class SimulatorBaseGui { player.getOpenInventory().setTitle(title()); } populate(); - if (player.getOpenInventory().getTopInventory() == inv) { + if (TrickyTrialsWrapper.impl.getTopInventory(player.getOpenInventory()) == inv) { inventory.open(); SimulatorWatcher.watch(player, simulator, this::open); } diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java index 32932a25..096fc5c4 100644 --- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java +++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java @@ -22,6 +22,7 @@ package de.steamwar.core; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; +import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper { @@ -44,4 +45,9 @@ public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper { public String getInventoryTitle(InventoryView view) { return view.getTitle(); } + + @Override + public Inventory getTopInventory(InventoryView view) { + return view.getTopInventory(); + } } diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java index 35b80c58..6e3ed151 100644 --- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java +++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java @@ -22,6 +22,7 @@ package de.steamwar.core; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; +import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; public class TrickyTrialsWrapper8 implements TrickyTrialsWrapper { @@ -44,4 +45,9 @@ public class TrickyTrialsWrapper8 implements TrickyTrialsWrapper { public String getInventoryTitle(InventoryView view) { return view.getTitle(); } + + @Override + public Inventory getTopInventory(InventoryView view) { + return view.getTopInventory(); + } } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java index da8fc7cd..5ce7ec2e 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java @@ -22,6 +22,7 @@ package de.steamwar.core; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; +import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; public interface TrickyTrialsWrapper { @@ -34,4 +35,6 @@ public interface TrickyTrialsWrapper { Material getTurtleScute(); String getInventoryTitle(InventoryView view); + + Inventory getTopInventory(InventoryView view); }