Fixed teleporting to warps from the menu opens the previous one

BG-Software-LLC · Dec 9, 2022 · e0c70e3 · e0c70e3
1 parent 0650ded
commit e0c70e3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/menu/impl/MenuWarps.java b/src/main/java/com/bgsoftware/superiorskyblock/core/menu/impl/MenuWarps.java
@@ -28,7 +28,6 @@
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import javax.annotation.Nullable;
@@ -78,8 +77,15 @@ public void simulateClick(SuperiorPlayer superiorPlayer, Island island, IslandWa
         }
 
         BukkitExecutor.sync(() -> {
-            superiorPlayer.runIfOnline(Player::closeInventory);
-            island.warpPlayer(superiorPlayer, islandWarp.getName());
+            superiorPlayer.runIfOnline(player -> {
+                MenuView<?, ?> currentView = superiorPlayer.getOpenedView();
+                if (currentView == null) {
+                    player.closeInventory();
+                } else {
+                    currentView.closeView();
+                }
+                island.warpPlayer(superiorPlayer, islandWarp.getName());
+            });
         }, 1L);
     }