More sign debug stuffs

src/main/java/com/drtshock/playervaults/listeners/SignListener.java

@@ -20,7 +20,6 @@ package com.drtshock.playervaults.listeners;
 
 import com.drtshock.playervaults.PlayerVaults;
 import com.drtshock.playervaults.translations.Lang;
-import com.drtshock.playervaults.vaultmanagement.VaultManager;
 import com.drtshock.playervaults.vaultmanagement.VaultOperations;
 import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
 import org.bukkit.Bukkit;
@@ -34,11 +33,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.CraftingInventory;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 public class SignListener implements Listener {
@@ -46,7 +42,7 @@ public class SignListener implements Listener {
 
     /**
      * TODO: Some of these events can be lag inducing (specifically: interactions & block breaking),
-     *         perhaps we should try to optimize these listeners at some point?
+     * perhaps we should try to optimize these listeners at some point?
      */
 
     public SignListener(PlayerVaults plugin) {
@@ -109,51 +105,44 @@ public class SignListener implements Listener {
                 int y = l.getBlockY();
                 int z = l.getBlockZ();
                 if (plugin.getSigns().getKeys(false).contains(world + ";;" + x + ";;" + y + ";;" + z)) {
+                    PlayerVaults.debug("Player " + player.getName() + " clicked sign at world(" + x + "," + y + "," + z + ")");
+                    if (PlayerVaults.getInstance().getInVault().containsKey(player.getUniqueId().toString())) {
+                        // don't let them open another vault.
+                        PlayerVaults.debug("Player " + player.getName() + " denied sign vault because already in a vault!");
+                        return;
+                    }
                     int num = PlayerVaults.getInstance().getSigns().getInt(world + ";;" + x + ";;" + y + ";;" + z + ".chest", 1);
+                    String numS = String.valueOf(num);
                     if (player.hasPermission("playervaults.signs.use") || player.hasPermission("playervaults.signs.bypass")) {
                         boolean self = PlayerVaults.getInstance().getSigns().getBoolean(world + ";;" + x + ";;" + y + ";;" + z + ".self", false);
                         String owner = self ? player.getName() : PlayerVaults.getInstance().getSigns().getString(world + ";;" + x + ";;" + y + ";;" + z + ".owner");
+                        PlayerVaults.debug("Player " + player.getName() + " wants to open a " + (self ? "self" : "non-self (" + owner + ")") + " sign vault");
                         OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner != null ? owner : event.getPlayer().getName()); // Not best way but :\
                         if (offlinePlayer == null || (!offlinePlayer.isOnline() && !offlinePlayer.hasPlayedBefore())) {
+                            PlayerVaults.debug("Denied sign vault for never-seen-before owner " + owner);
                             player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
                             return;
                         }
                         if (self) {
                             // We already checked that they can use signs, now lets check if they have this many vaults.
-                            if (VaultOperations.checkPerms(player, num)) {
+                            if (VaultOperations.openOwnVault(player, numS, true)) {
-                                Inventory inv = VaultManager.getInstance().loadOwnVault(player, num, VaultOperations.getMaxVaultSize(player));
+                                PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(player.getUniqueId().toString(), num));
-                                if (inv != null) {
-                                    player.openInventory(inv);
-
-                                    // Check if the inventory was actually opened
-                                    if (player.getOpenInventory().getTopInventory() instanceof CraftingInventory || player.getOpenInventory().getTopInventory() == null) {
-                                        PlayerVaults.debug(String.format("Cancelled opening sign vault.", player.getName()));
-                                        return; // inventory open event was cancelled.
-                                    }
-                                }
                             } else {
-                                player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS.toString());
+                                PlayerVaults.debug("Player " + player.getName() + " failed to open sign vault!");
-                                return; // Otherwise it would try to add vault view info down there.
+                                return;
                             }
                         } else {
-                            Inventory inv = VaultManager.getInstance().loadOtherVault(offlinePlayer.getUniqueId().toString(), num, VaultOperations.getMaxVaultSize(offlinePlayer));
+                            if (!VaultOperations.openOtherVault(player, owner, numS, false)) {
-                            if (inv == null) {
+                                PlayerVaults.debug("Player " + player.getName() + " failed to open sign vault!");
-                                player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
+                                return;
-                            } else {
-                                player.openInventory(inv);
-
-                                // Check if the inventory was actually opened
-                                if (player.getOpenInventory().getTopInventory() instanceof CraftingInventory || player.getOpenInventory().getTopInventory() == null) {
-                                    PlayerVaults.debug(String.format("Cancelled opening non-self sign vault.", player.getName()));
-                                    return; // inventory open event was cancelled.
-                                }
                             }
                         }
-                        PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(self ? player.getUniqueId().toString() : offlinePlayer.getUniqueId().toString(), num));
+                        PlayerVaults.debug("Player " + player.getName() + " succeeded in opening sign vault");
                         event.setCancelled(true);
                         player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_WITH_SIGN.toString().replace("%v", String.valueOf(num)).replace("%p", owner));
                     } else {
                         player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
+                        PlayerVaults.debug("Player " + player.getName() + " no sign perms!");
                     }
                 }
             }

src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java

@@ -129,6 +129,14 @@ public class VaultOperations {
      * @return Whether or not the player was allowed to open it.
      */
     public static boolean openOwnVault(Player player, String arg) {
+        return openOwnVaultE(player, arg, false, true);
+    }
+
+    public static boolean openOwnVaultSign(Player player, String arg) {
+        return openOwnVaultE(player, arg, true, false);
+    }
+
+    private static boolean openOwnVaultE(Player player, String arg, boolean free, boolean send) {
         if (isLocked()) {
             return false;
         }
@@ -147,7 +155,7 @@ public class VaultOperations {
         }
 
         if (checkPerms(player, number)) {
-            if (EconomyOperations.payToOpen(player, number)) {
+            if (free || EconomyOperations.payToOpen(player, number)) {
                 Inventory inv = VaultManager.getInstance().loadOwnVault(player, number, getMaxVaultSize(player));
                 if (inv == null) {
                     PlayerVaults.debug(String.format("Failed to open null vault %d for %s. This is weird.", number, player.getName()));
@@ -165,7 +173,9 @@ public class VaultOperations {
                 VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
                 PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
 
-                player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
+                if (send) {
+                    player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
+                }
                 return true;
             } else {
                 player.sendMessage(Lang.TITLE.toString() + Lang.INSUFFICIENT_FUNDS);
@@ -202,6 +212,10 @@ public class VaultOperations {
      * @return Whether or not the player was allowed to open it.
      */
     public static boolean openOtherVault(Player player, String vaultOwner, String arg) {
+        return openOtherVault(player, vaultOwner, arg, true);
+    }
+
+    public static boolean openOtherVault(Player player, String vaultOwner, String arg, boolean send) {
         if (isLocked()) {
             return false;
         }
@@ -242,7 +256,9 @@ public class VaultOperations {
                 PlayerVaults.debug(String.format("Cancelled opening vault %s for %s from an outside source.", arg, player.getName()));
                 return false; // inventory open event was cancelled.
             }
-            player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", name));
+            if (send) {
+                player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", name));
+            }
             PlayerVaults.debug("opening other vault", time);
 
             // Need to set ViewInfo for a third party vault for the opening player.