code cleanup, add todos, logs

UsainSrht · Jan 9, 2024 · 5444d3b · 5444d3b
1 parent c864607
commit 5444d3b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/me/usainsrht/uhomes/UHomes.java b/src/main/java/me/usainsrht/uhomes/UHomes.java
@@ -39,12 +39,10 @@ public void onEnable() {
 
         this.homeManager = new HomeManager(this);
         this.teleportManager = new TeleportManager(this);
-        //Bukkit.getScheduler().runTaskLater(this, () -> {
-            Object claimAPI = null;
-            if (getServer().getPluginManager().isPluginEnabled("Lands")) claimAPI = LandsIntegration.of(this);
-            else if (getServer().getPluginManager().isPluginEnabled("GriefPrevention")) claimAPI = GriefPrevention.instance;
-            this.claimManager = new ClaimManager(this, claimAPI);
-        //}, 1L);
+        Object claimAPI = null;
+        if (getServer().getPluginManager().isPluginEnabled("Lands")) claimAPI = LandsIntegration.of(this);
+        else if (getServer().getPluginManager().isPluginEnabled("GriefPrevention")) claimAPI = GriefPrevention.instance;
+        this.claimManager = new ClaimManager(this, claimAPI);
 
         loadConfig();
 

diff --git a/src/main/java/me/usainsrht/uhomes/command/HomeCommand.java b/src/main/java/me/usainsrht/uhomes/command/HomeCommand.java
@@ -16,6 +16,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -88,6 +89,7 @@ public boolean execute(CommandSender sender, String command, String[] args) {
                     homesFuture.thenAccept(homes -> {
                         for (Home home : homes) {
                             if (home.getName() != null && home.getName().equalsIgnoreCase(name)) {
+                                Bukkit.broadcastMessage("tp call from cmd");
                                 homeManager.teleport(player, home);
                                 return;
                             }

diff --git a/src/main/java/me/usainsrht/uhomes/listener/InventoryClickListener.java b/src/main/java/me/usainsrht/uhomes/listener/InventoryClickListener.java
@@ -7,6 +7,7 @@
 import me.usainsrht.uhomes.command.SetHomeCommand;
 import me.usainsrht.uhomes.gui.HomeButtonAction;
 import me.usainsrht.uhomes.gui.HomesGUI;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -55,8 +56,12 @@ public void onClick(InventoryClickEvent e) {
                         HomeButtonAction action = HomeButtonAction.getFromClick(e.getClick());
                         if (action == null) return;
                         player.closeInventory();
+                        Bukkit.broadcastMessage("tp call from click " + action);
                         switch (action) {
-                            case TELEPORT -> homeManager.teleport(player, home);
+                            case TELEPORT -> {
+                                Bukkit.broadcastMessage("case teleport");
+                                homeManager.teleport(player, home);
+                            }
                             case RELOCATE -> {
                                 homeManager.relocate(player, home);
                                 HomesGUI.open(home.getOwner(), player);

diff --git a/src/main/java/me/usainsrht/uhomes/manager/ClaimManager.java b/src/main/java/me/usainsrht/uhomes/manager/ClaimManager.java
@@ -28,7 +28,9 @@ public Object getClaimAPI() {
     }
 
     public boolean canEnter(Player player, Location location) {
-        if (claimAPI instanceof LandsIntegration api) {
+        if (claimAPI == null) return true;
+        //todo stops code silently when class is undefined
+        else if (claimAPI instanceof LandsIntegration api) {
             Area area = api.getArea(location);
             if (area == null) return true;
             return (area.isTrusted(player.getUniqueId()));

diff --git a/src/main/java/me/usainsrht/uhomes/manager/HomeManager.java b/src/main/java/me/usainsrht/uhomes/manager/HomeManager.java
@@ -257,7 +257,6 @@ public void teleport(Entity entity, Home home) {
                     SoundUtil.play(entity, MainConfig.getSound("teleport_start"));
                 })
                 ;
-
         plugin.getTeleportManager().start(timedTeleport);
     }