Fix: getOpenInventory

This commit is contained in:
2024-12-01 20:13:12 +01:00
parent bf21d7ee90
commit a009c841b1
4 changed files with 17 additions and 2 deletions
@@ -55,7 +55,7 @@ public abstract class SimulatorBaseGui {
inv.setItem(i, null); inv.setItem(i, null);
} }
setup(); setup();
if (player.getOpenInventory().getTopInventory() != inv) { if (TrickyTrialsWrapper.impl.getTopInventory(player.getOpenInventory()) != inv) {
inventory.open(); inventory.open();
SimulatorWatcher.watch(player, simulator, this::open); SimulatorWatcher.watch(player, simulator, this::open);
} }
@@ -63,7 +63,7 @@ public abstract class SimulatorBaseGui {
player.getOpenInventory().setTitle(title()); player.getOpenInventory().setTitle(title());
} }
populate(); populate();
if (player.getOpenInventory().getTopInventory() == inv) { if (TrickyTrialsWrapper.impl.getTopInventory(player.getOpenInventory()) == inv) {
inventory.open(); inventory.open();
SimulatorWatcher.watch(player, simulator, this::open); SimulatorWatcher.watch(player, simulator, this::open);
} }
@@ -22,6 +22,7 @@ package de.steamwar.core;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper { public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper {
@@ -44,4 +45,9 @@ public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper {
public String getInventoryTitle(InventoryView view) { public String getInventoryTitle(InventoryView view) {
return view.getTitle(); return view.getTitle();
} }
@Override
public Inventory getTopInventory(InventoryView view) {
return view.getTopInventory();
}
} }
@@ -22,6 +22,7 @@ package de.steamwar.core;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
public class TrickyTrialsWrapper8 implements TrickyTrialsWrapper { public class TrickyTrialsWrapper8 implements TrickyTrialsWrapper {
@@ -44,4 +45,9 @@ public class TrickyTrialsWrapper8 implements TrickyTrialsWrapper {
public String getInventoryTitle(InventoryView view) { public String getInventoryTitle(InventoryView view) {
return view.getTitle(); return view.getTitle();
} }
@Override
public Inventory getTopInventory(InventoryView view) {
return view.getTopInventory();
}
} }
@@ -22,6 +22,7 @@ package de.steamwar.core;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
public interface TrickyTrialsWrapper { public interface TrickyTrialsWrapper {
@@ -34,4 +35,6 @@ public interface TrickyTrialsWrapper {
Material getTurtleScute(); Material getTurtleScute();
String getInventoryTitle(InventoryView view); String getInventoryTitle(InventoryView view);
Inventory getTopInventory(InventoryView view);
} }