fix(head): Fixed the issues #50

ArtformGames · Sep 17, 2024 · f749375 · f749375
1 parent 35278ae
commit f749375
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/artformgames/plugin/residencelist/ui/ResidenceInfoUI.java b/plugin/src/main/java/com/artformgames/plugin/residencelist/ui/ResidenceInfoUI.java
@@ -18,6 +18,7 @@
 import com.artformgames.plugin.residencelist.conf.PluginMessages;
 import com.artformgames.plugin.residencelist.listener.EditHandler;
 import com.artformgames.plugin.residencelist.utils.GUIUtils;
+import com.artformgames.plugin.residencelist.utils.ResidenceUtils;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -101,7 +102,7 @@ public void onClick(Player clicker, ClickType type) {
             setItem(13, new GUIItem(CONFIG.ITEMS.TELEPORT_DISABLED.prepare().get(getViewer())));
         }
 
-        if (getData().getOwner() == null) {
+        if (ResidenceUtils.isServerLand(getData().getResidence())) {
             setItem(14, new GUIItem(CONFIG.ITEMS.SERVER.prepare().get(getViewer())));
         } else {
             setItem(14, new GUIItem(CONFIG.ITEMS.OWNER.prepare(getData().getOwner())

diff --git a/plugin/src/main/java/com/artformgames/plugin/residencelist/utils/ResidenceUtils.java b/plugin/src/main/java/com/artformgames/plugin/residencelist/utils/ResidenceUtils.java
@@ -0,0 +1,13 @@
+package com.artformgames.plugin.residencelist.utils;
+
+import com.bekvon.bukkit.residence.Residence;
+import com.bekvon.bukkit.residence.protection.ClaimedResidence;
+
+public class ResidenceUtils {
+
+
+    public static boolean isServerLand(ClaimedResidence residence) {
+        return Residence.getInstance().getServerUUID().equals(residence.getOwnerUUID())
+                || Residence.getInstance().getEmptyUserUUID().equals(residence.getOwnerUUID());
+    }
+}