mirror/Dominion
2
0
Fork 0
mirror of https://github.com/ColdeZhang/Dominion.git synced 2024-12-20 22:29:47 +08:00
Code Issues Actions Packages Projects Releases 43 Wiki Activity

新增盔甲架、展示框权限控制（归属到普通容器）

Browse Source
This commit is contained in:
zhangyuheng 2024-03-15 01:02:33 +08:00
parent be3fd701b1
commit da8aa007d4
5 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -120,10 +120,10 @@
## 指令
### 玩家指令
以下指令尖括号`<>`表示必填参数，方括号`[]`表示可选参数。
### 玩家指令
| 指令名 | 指令 |
|------------|-------------------------------------------------------------|
| 打开交互菜单 | `/dominion menu` |

2
pom.xml
View File

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

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

@ -7,6 +7,7 @@ import cn.lunadeer.dominion.dtos.PlayerPrivilegeDTO;
import cn.lunadeer.dominion.utils.Notification;
import io.papermc.paper.event.entity.EntityDyeEvent;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.block.Block;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
@ -22,6 +23,7 @@ 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.persistence.PersistentDataType;
import org.spigotmc.event.entity.EntityMountEvent;
public class PlayerEvents implements Listener {
@ -314,6 +316,29 @@ public class PlayerEvents implements Listener {
event.setCancelled(true);
}
// 检查是否有容器权限
private static boolean hasContainerPermission(Player player) {
DominionDTO dom = Cache.instance.getPlayerCurrentDominion(player);
if (dom == null) {
return true;
}
if (Apis.hasPermission(player, dom)) {
return true;
}
PlayerPrivilegeDTO privilege = Cache.instance.getPlayerPrivilege(player, dom);
if (privilege != null) {
if (privilege.getContainer()) {
return true;
}
} else {
if (dom.getContainer()) {
return true;
}
}
Notification.error(player, "你没有使用容器/盔甲架/展示框的权限");
return false;
}
@EventHandler(priority = EventPriority.HIGHEST) // container
public void openContainer(InventoryOpenEvent event) {
if (event.getInventory().getType() != InventoryType.CHEST &&
@ -325,24 +350,47 @@ public class PlayerEvents implements Listener {
return;
}
Player bukkitPlayer = (Player) event.getPlayer();
DominionDTO dom = Cache.instance.getPlayerCurrentDominion(bukkitPlayer);
if (dom == null) {
if (hasContainerPermission(bukkitPlayer)) {
return;
}
if (Apis.hasPermission(bukkitPlayer, dom)) {
event.setCancelled(true);
}
@EventHandler(priority = EventPriority.HIGHEST) // container (armor stand)
public void manipulateArmorStand(PlayerArmorStandManipulateEvent event) {
Player bukkitPlayer = event.getPlayer();
if (hasContainerPermission(bukkitPlayer)) {
return;
}
PlayerPrivilegeDTO privilege = Cache.instance.getPlayerPrivilege(bukkitPlayer, dom);
if (privilege != null) {
if (privilege.getContainer()) {
event.setCancelled(true);
}
@EventHandler(priority = EventPriority.HIGHEST) // container （item frame）
public void putSomeOnItemFrame(PlayerInteractEntityEvent event) {
Entity entity = event.getRightClicked();
if (!(entity instanceof ItemFrame)) {
return;
}
} else {
if (dom.getContainer()) {
Player bukkitPlayer = event.getPlayer();
if (hasContainerPermission(bukkitPlayer)) {
return;
}
event.setCancelled(true);
}
@EventHandler(priority = EventPriority.HIGHEST) // container （item frame）
public void removeSomeOnItemFrame(EntityDamageByEntityEvent event) {
Entity entity = event.getEntity();
if (!(entity instanceof ItemFrame)) {
return;
}
if (!(event.getDamager() instanceof Player)) {
return;
}
Player bukkitPlayer = (Player) event.getDamager();
if (hasContainerPermission(bukkitPlayer)) {
return;
}
Notification.error(bukkitPlayer, "你没有使用容器的权限");
event.setCancelled(true);
}

4
src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java
View File

@ -122,11 +122,11 @@ public class DominionFlagInfo {
if (dominion.getContainer()) {
view.add(Line.create()
.append(Button.createGreen("☑", "/dominion set container false " + dominion.getName() + " " + page))
.append("箱子/木桶/潜影盒"));
.append("箱子/木桶/潜影盒/盔甲架/展示框"));
} else {
view.add(Line.create()
.append(Button.createRed("☐", "/dominion set container true " + dominion.getName() + " " + page))
.append("箱子/木桶/潜影盒"));
.append("箱子/木桶/潜影盒/盔甲架/展示框"));
}
if (dominion.getCraft()) {
view.add(Line.create()

4
src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java
View File

@ -146,11 +146,11 @@ public class PrivilegeInfo {
if (privilege.getContainer()) {
view.add(Line.create()
.append(Button.createGreen("☑", "/dominion set_privilege " + playerName + " container false " + dominion.getName() + " " + page))
.append("箱子/木桶/潜影盒"));
.append("箱子/木桶/潜影盒/盔甲架/展示框"));
} else {
view.add(Line.create()
.append(Button.createRed("☐", "/dominion set_privilege " + playerName + " container true " + dominion.getName() + " " + page))
.append("箱子/木桶/潜影盒"));
.append("箱子/木桶/潜影盒/盔甲架/展示框"));
}
if (privilege.getCraft()) {
view.add(Line.create()