diff --git a/pom.xml b/pom.xml index 412f9fe..7129e7b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.28.7-beta + 1.28.8-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/events/Apis.java b/src/main/java/cn/lunadeer/dominion/events/Apis.java index bad5ed1..c0923c6 100644 --- a/src/main/java/cn/lunadeer/dominion/events/Apis.java +++ b/src/main/java/cn/lunadeer/dominion/events/Apis.java @@ -31,7 +31,7 @@ public class Apis { public static DominionDTO getInvDominion(Player bukkitPlayer, Inventory inv) { if (inv.getLocation() == null) { - return Cache.instance.getPlayerCurrentDominion(bukkitPlayer); + return null; } else { return Cache.instance.getDominion(inv.getLocation()); } diff --git a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java index 976bcf3..288bbeb 100644 --- a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java +++ b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java @@ -5,7 +5,6 @@ import cn.lunadeer.dominion.dtos.DominionDTO; import cn.lunadeer.dominion.dtos.Flag; import cn.lunadeer.dominion.dtos.PlayerDTO; import cn.lunadeer.minecraftpluginutils.Teleport; -import cn.lunadeer.minecraftpluginutils.XLogger; import io.papermc.paper.event.entity.EntityDyeEvent; import org.bukkit.Location; import org.bukkit.Material; @@ -26,7 +25,6 @@ import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.*; import org.bukkit.event.vehicle.VehicleDestroyEvent; -import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.Inventory; import org.spigotmc.event.entity.EntityMountEvent; @@ -194,7 +192,7 @@ public class PlayerEvents implements Listener { private static boolean hasContainerPermission(Player player, Location loc) { DominionDTO dom; if (loc == null) { - dom = Cache.instance.getPlayerCurrentDominion(player); + dom = null; } else { dom = Cache.instance.getDominion(loc); } @@ -203,10 +201,6 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // container public void openContainer(InventoryOpenEvent event) { - if (event.getInventory() instanceof CraftingInventory) { - XLogger.debug("CraftingInventory opened"); - return; - } if (event.getInventory().getType() != InventoryType.CHEST && event.getInventory().getType() != InventoryType.BARREL && event.getInventory().getType() != InventoryType.SHULKER_BOX) {