youpaishidifu/Sdf1_login
1
1
Fork 0
Code Issues 15 Pull Requests Actions 1 Packages Projects Releases 13 Wiki Activity

fix: 领地点燃权限修复OWNER/ADMIN豁免+补充岩浆桶/打火石拦截

Browse Source 
1. onIgnite(onBlockIgnite): 加入OWNER/ADMIN豁免检查，避免误伤领地主
2. onPlayerInteractFire: 加入岩浆桶(MAGMA_BUCKET→LAVA_BUCKET)拦截
3. onPlayerInteractFire: 加入OWNER/ADMIN豁免
4. 清理冗余的TNT材质检查逻辑
This commit is contained in:
youpaishidifu
2026-07-02 23:49:45 +08:00
parent 106211564b
commit 3ece4c8369
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/Sdf1_login/AreaProtection.java
+13 -4
View File
@@ -9550,6 +9550,10 @@ public class AreaProtection implements Listener {
tgtBlock.getWorld().getName(),
tgtBlock.getX(), tgtBlock.getY(), tgtBlock.getZ());
// OWNER/ADMIN 豁免
if (p != null && srcArea != null && hasPermission(p, srcArea, PermissionLevel.OWNER)) return;
if (p != null && tgtArea != null && hasPermission(p, tgtArea, PermissionLevel.OWNER)) return;
// 任何一方denyFire=true就阻止
if ((srcArea != null && srcArea.denyFire) || (tgtArea != null && tgtArea.denyFire)) {
e.setCancelled(true);
@@ -9566,11 +9570,12 @@ public class AreaProtection implements Listener {
Action action = e.getAction();
Material mat = e.getItem() == null ? null : e.getItem().getType();
// 只拦截 RIGHT_CLICK_BLOCK/AIR 使用打火石/火床/TNT
// 只拦截 RIGHT_CLICK_BLOCK/AIR 使用打火石/火床/TNT/岩浆桶
if (action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) return;
if (mat != Material.FLINT_AND_STEEL && mat != Material.FIRE_CHARGE && mat != Material.CAMPFIRE && mat != Material.SOUL_CAMPFIRE) {
// 如果是打火石或火球，检查使用的物品
if (mat != Material.TNT) return;
if (mat != Material.FLINT_AND_STEEL && mat != Material.FIRE_CHARGE
&& mat != Material.CAMPFIRE && mat != Material.SOUL_CAMPFIRE
&& mat != Material.LAVA_BUCKET) {
return;
}
// 检查目标方块或玩家所处领地
@@ -9588,6 +9593,10 @@ public class AreaProtection implements Listener {
clickedBlock.getX(), clickedBlock.getY(), clickedBlock.getZ());
}
// OWNER/ADMIN 豁免
if (hasPermission(p, ac1, PermissionLevel.OWNER)) return;
if (hasPermission(p, ac2, PermissionLevel.OWNER)) return;
if ((ac1 != null && ac1.denyFire) || (ac2 != null && ac2.denyFire)) {
e.setCancelled(true);
p.sendMessage("§c§l[区域防护] §f此区域禁止点燃物品");