zhangyuheng
/
Dominion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 104 Wiki Activity

支持兼容第三方箱子UI，避免被本插件关闭
Java CI-CD with Maven / build (push) Successful in 18m31s Details

This commit is contained in:
zhangyuheng 2024-05-27 23:37:54 +08:00
parent 3ec1a3447c
commit d9787a9b32
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>cn.lunadeer</groupId>
<artifactId>Dominion</artifactId>
<version>1.28.7-beta</version>
<version>1.28.8-beta</version>
<packaging>jar</packaging>
<name>Dominion</name>

2
src/main/java/cn/lunadeer/dominion/events/Apis.java
View File

@ -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());
}

8
src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
View File

@ -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) {