minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 04:21:31 +02:00
Code Issues Releases Wiki Activity

More work on Protect

Browse Source
This commit is contained in:
snowleo
2012-01-03 02:51:19 +01:00
parent 869d79ae73
commit 801562ac2c
6 changed files with 270 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Essentials/src/com/earth2me/essentials/Util.java
View File

@@ -618,6 +618,7 @@ public final class Util
} }
parent = perm; parent = perm;
} }
perm.recalculatePermissibles();
return perm; return perm;
} }
private static transient final Pattern COLOR_PATTERN = Pattern.compile("(?i)\u00A7[0-9A-F]"); private static transient final Pattern COLOR_PATTERN = Pattern.compile("(?i)\u00A7[0-9A-F]");

43
EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java Normal file
View File

@@ -0,0 +1,43 @@
package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IPermission;
import com.earth2me.essentials.perm.AbstractSuperpermsPermission;
import java.util.EnumMap;
import java.util.Locale;
import java.util.Map;
import org.bukkit.Material;
import org.bukkit.permissions.PermissionDefault;
public class BlockBreakPermissions extends AbstractSuperpermsPermission{
private static Map<Material,IPermission> permissions = new EnumMap<Material, IPermission>(Material.class);
private static final String base = "essentials.protect.blockbreak.";
private final String permission;
public static IPermission getPermission(Material mat)
{
IPermission perm = permissions.get(mat);
if (perm == null) {
perm = new BlockBreakPermissions(mat.toString().toLowerCase(Locale.ENGLISH));
permissions.put(mat, perm);
}
return perm;
}
private BlockBreakPermissions(String matName)
{
this.permission = base + matName;
}
@Override
public String getPermission()
{
return this.permission;
}
@Override
public PermissionDefault getPermissionDefault()
{
return PermissionDefault.TRUE;
}
}

42
EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java Normal file
View File

@@ -0,0 +1,42 @@
package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IPermission;
import com.earth2me.essentials.perm.AbstractSuperpermsPermission;
import java.util.EnumMap;
import java.util.Locale;
import java.util.Map;
import org.bukkit.Material;
import org.bukkit.permissions.PermissionDefault;
public class BlockPlacePermissions extends AbstractSuperpermsPermission{
private static Map<Material,IPermission> permissions = new EnumMap<Material, IPermission>(Material.class);
private static final String base = "essentials.protect.blockplace.";
private final String permission;
public static IPermission getPermission(Material mat)
{
IPermission perm = permissions.get(mat);
if (perm == null) {
perm = new BlockPlacePermissions(mat.toString().toLowerCase(Locale.ENGLISH));
permissions.put(mat, perm);
}
return perm;
}
private BlockPlacePermissions(String matName)
{
this.permission = base + matName;
}
@Override
public String getPermission()
{
return this.permission;
}
@Override
public PermissionDefault getPermissionDefault()
{
return PermissionDefault.TRUE;
}
}

295
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
View File

@@ -32,64 +32,72 @@ public class EssentialsProtectBlockListener extends BlockListener
} }
final IUser user = ess.getUser(event.getPlayer()); final IUser user = ess.getUser(event.getPlayer());
final ProtectHolder settings = prot.getSettings();
if (prot.getSettingBool(ProtectConfig.disable_build) && !user.isAuthorized(Permissions.BUILD)) settings.acquireReadLock();
try
{ {
event.setCancelled(true); if (!user.isAuthorized(Permissions.BUILD))
return;
}
final Block blockPlaced = event.getBlockPlaced();
final int id = blockPlaced.getTypeId();
if (prot.checkProtectionItems(ProtectConfig.blacklist_placement, id) && !user.isAuthorized("essentials.protect.exemptplacement"))
{
event.setCancelled(true);
return;
}
if (prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
{
prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
}
final Block below = blockPlaced.getRelative(BlockFace.DOWN);
if ((below.getType() == Material.RAILS || below.getType() == Material.POWERED_RAIL || below.getType() == Material.DETECTOR_RAIL)
&& prot.getSettingBool(ProtectConfig.prevent_block_on_rail)
&& prot.getStorage().isProtected(below, user.getName()))
{
event.setCancelled(true);
return;
}
final List<Block> protect = new ArrayList<Block>();
if ((blockPlaced.getType() == Material.RAILS || blockPlaced.getType() == Material.POWERED_RAIL || blockPlaced.getType() == Material.DETECTOR_RAIL)
&& prot.getSettingBool(ProtectConfig.protect_rails)
&& user.isAuthorized("essentials.protect"))
{
protect.add(blockPlaced);
if (prot.getSettingBool(ProtectConfig.protect_below_rails)
&& !prot.getStorage().isProtected(blockPlaced.getRelative(BlockFace.DOWN), user.getName()))
{ {
protect.add(blockPlaced.getRelative(BlockFace.DOWN)); event.setCancelled(true);
return;
}
final Block blockPlaced = event.getBlockPlaced();
final int id = blockPlaced.getTypeId();
if (!user.isAuthorized(BlockPlacePermissions.getPermission(blockPlaced.getType())))
{
event.setCancelled(true);
return;
}
if (settings.getData().getAlertOnPlacement().contains(blockPlaced.getType()))
{
prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
}
final Block below = blockPlaced.getRelative(BlockFace.DOWN);
if ((below.getType() == Material.RAILS || below.getType() == Material.POWERED_RAIL || below.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isPreventBlockAboveRails()
&& prot.getStorage().isProtected(below, user.getName()))
{
event.setCancelled(true);
return;
}
final List<Block> protect = new ArrayList<Block>();
if ((blockPlaced.getType() == Material.RAILS || blockPlaced.getType() == Material.POWERED_RAIL || blockPlaced.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isRails()
&& user.isAuthorized("essentials.protect"))
{
protect.add(blockPlaced);
if (settings.getData().getSignsAndRails().isBlockBelow()
&& !prot.getStorage().isProtected(blockPlaced.getRelative(BlockFace.DOWN), user.getName()))
{
protect.add(blockPlaced.getRelative(BlockFace.DOWN));
}
}
if ((blockPlaced.getType() == Material.SIGN_POST || blockPlaced.getType() == Material.WALL_SIGN)
&& settings.getData().getSignsAndRails().isSigns()
&& user.isAuthorized("essentials.protect"))
{
protect.add(blockPlaced);
if (settings.getData().getSignsAndRails().isBlockBelow()
&& event.getBlockAgainst().getType() != Material.SIGN_POST
&& event.getBlockAgainst().getType() != Material.WALL_SIGN
&& !prot.getStorage().isProtected(event.getBlockAgainst(), user.getName()))
{
protect.add(event.getBlockAgainst());
}
}
for (Block block : protect)
{
prot.getStorage().protectBlock(block, user.getName());
} }
} }
if ((blockPlaced.getType() == Material.SIGN_POST || blockPlaced.getType() == Material.WALL_SIGN) finally
&& prot.getSettingBool(ProtectConfig.protect_signs)
&& user.isAuthorized("essentials.protect"))
{ {
protect.add(blockPlaced); settings.unlock();
if (prot.getSettingBool(ProtectConfig.protect_against_signs)
&& event.getBlockAgainst().getType() != Material.SIGN_POST
&& event.getBlockAgainst().getType() != Material.WALL_SIGN
&& !prot.getStorage().isProtected(event.getBlockAgainst(), user.getName()))
{
protect.add(event.getBlockAgainst());
}
}
for (Block block : protect)
{
prot.getStorage().protectBlock(block, user.getName());
} }
} }
@@ -100,47 +108,56 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
return; return;
} }
final Block block = event.getBlock(); final ProtectHolder settings = prot.getSettings();
if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL) settings.acquireReadLock();
&& prot.getSettingBool(ProtectConfig.protect_rails)) try
{ {
event.setCancelled(true); final Block block = event.getBlock();
return; if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL)
} && settings.getData().getSignsAndRails().isRails())
if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) {
&& prot.getSettingBool(ProtectConfig.protect_signs)) event.setCancelled(true);
{ return;
event.setCancelled(true); }
return; if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)
} && settings.getData().getSignsAndRails().isSigns())
if (event.getBlock().getType() == Material.OBSIDIAN {
|| event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN) event.setCancelled(true);
{ return;
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_portal_creation)); }
return; if (event.getBlock().getType() == Material.OBSIDIAN
} || event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN)
{
event.setCancelled(settings.getData().getPrevent().isPortalCreation());
return;
}
if (event.getCause().equals(BlockIgniteEvent.IgniteCause.SPREAD)) if (event.getCause().equals(BlockIgniteEvent.IgniteCause.SPREAD))
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_fire_spread)); event.setCancelled(settings.getData().getPrevent().isFirespread());
return; return;
} }
if (event.getCause().equals(BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL)) if (event.getCause().equals(BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL) && event.getPlayer() != null)
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_flint_fire)); event.setCancelled(ess.getUser(event.getPlayer()).isAuthorized(Permissions.USEFLINTSTEEL));
return; return;
} }
if (event.getCause().equals(BlockIgniteEvent.IgniteCause.LAVA)) if (event.getCause().equals(BlockIgniteEvent.IgniteCause.LAVA))
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_lava_fire_spread)); event.setCancelled(settings.getData().getPrevent().isLavaFirespread());
return; return;
}
if (event.getCause().equals(BlockIgniteEvent.IgniteCause.LIGHTNING))
{
event.setCancelled(settings.getData().getPrevent().isLightningFirespread());
return;
}
} }
if (event.getCause().equals(BlockIgniteEvent.IgniteCause.LIGHTNING)) finally
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_lightning_fire_spread)); settings.unlock();
return;
} }
} }
@@ -151,37 +168,46 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
return; return;
} }
final Block toBlock = event.getToBlock(); final ProtectHolder settings = prot.getSettings();
if ((toBlock.getType() == Material.RAILS || toBlock.getType() == Material.POWERED_RAIL || toBlock.getType() == Material.DETECTOR_RAIL) settings.acquireReadLock();
&& prot.getSettingBool(ProtectConfig.protect_rails)) try
{ {
event.setCancelled(true); final Block toBlock = event.getToBlock();
return; if ((toBlock.getType() == Material.RAILS || toBlock.getType() == Material.POWERED_RAIL || toBlock.getType() == Material.DETECTOR_RAIL)
} && settings.getData().getSignsAndRails().isRails())
if ((toBlock.getType() == Material.WALL_SIGN || toBlock.getType() == Material.SIGN_POST) {
&& prot.getSettingBool(ProtectConfig.protect_signs)) event.setCancelled(true);
{ return;
event.setCancelled(true); }
return; if ((toBlock.getType() == Material.WALL_SIGN || toBlock.getType() == Material.SIGN_POST)
} && settings.getData().getSignsAndRails().isSigns())
{
event.setCancelled(true);
return;
}
final Block block = event.getBlock(); final Block block = event.getBlock();
if (block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER) if (block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER)
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_flow)); event.setCancelled(settings.getData().getPrevent().isWaterFlow());
return; return;
} }
if (block.getType() == Material.LAVA || block.getType() == Material.STATIONARY_LAVA) if (block.getType() == Material.LAVA || block.getType() == Material.STATIONARY_LAVA)
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_lava_flow)); event.setCancelled(settings.getData().getPrevent().isLavaFlow());
return; return;
}
// TODO: Test if this still works
/*
* if (block.getType() == Material.AIR) {
* event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_bucket_flow)); return;
}
*/
} }
finally
if (block.getType() == Material.AIR)
{ {
event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_bucket_flow)); settings.unlock();
return;
} }
} }
@@ -192,22 +218,32 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
return; return;
} }
final Block block = event.getBlock(); final ProtectHolder settings = prot.getSettings();
if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL) && prot.getSettingBool(ProtectConfig.protect_rails)) settings.acquireReadLock();
try
{ {
event.setCancelled(true); final Block block = event.getBlock();
return; if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isRails())
{
event.setCancelled(true);
return;
}
if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)
&& settings.getData().getSignsAndRails().isSigns())
{
event.setCancelled(true);
return;
}
if (settings.getData().getPrevent().isFirespread())
{
event.setCancelled(true);
return;
}
} }
if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) finally
&& prot.getSettingBool(ProtectConfig.protect_signs))
{ {
event.setCancelled(true); settings.unlock();
return;
}
if (prot.getSettingBool(ProtectConfig.prevent_fire_spread))
{
event.setCancelled(true);
return;
} }
} }
private final static BlockFace[] faces = new BlockFace[] private final static BlockFace[] faces = new BlockFace[]
@@ -230,7 +266,7 @@ public class EssentialsProtectBlockListener extends BlockListener
} }
final IUser user = ess.getUser(event.getPlayer()); final IUser user = ess.getUser(event.getPlayer());
if (prot.getSettingBool(ProtectConfig.disable_build) && !user.isAuthorized(Permissions.BUILD)) if (!user.isAuthorized(Permissions.BUILD))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -238,8 +274,7 @@ public class EssentialsProtectBlockListener extends BlockListener
final Block block = event.getBlock(); final Block block = event.getBlock();
final int typeId = block.getTypeId(); final int typeId = block.getTypeId();
if (prot.checkProtectionItems(ProtectConfig.blacklist_break, typeId) if (!user.isAuthorized(BlockBreakPermissions.getPermission(block.getType())))
&& !user.isAuthorized("essentials.protect.exemptbreak"))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;

25
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View File

@@ -145,43 +145,38 @@ public class EssentialsProtectEntityListener extends EntityListener
if (target instanceof Player) if (target instanceof Player)
{ {
if (cause == DamageCause.FALL if (cause == DamageCause.FALL
&& prot.getSettingBool(ProtectConfig.disable_fall) && (user.isAuthorized(Permissions.PREVENTDAMAGE_FALL)
&& !(user.isAuthorized("essentials.protect.damage.fall") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (cause == DamageCause.SUFFOCATION if (cause == DamageCause.SUFFOCATION
&& prot.getSettingBool(ProtectConfig.disable_suffocate) && (user.isAuthorized(Permissions.PREVENTDAMAGE_SUFFOCATION)
&& !(user.isAuthorized("essentials.protect.damage.suffocation") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if ((cause == DamageCause.FIRE if ((cause == DamageCause.FIRE
|| cause == DamageCause.FIRE_TICK) || cause == DamageCause.FIRE_TICK)
&& prot.getSettingBool(ProtectConfig.disable_firedmg) && (user.isAuthorized(Permissions.PREVENTDAMAGE_FIRE)
&& !(user.isAuthorized("essentials.protect.damage.fire") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (cause == DamageCause.DROWNING if (cause == DamageCause.DROWNING
&& prot.getSettingBool(ProtectConfig.disable_drown) && (user.isAuthorized(Permissions.PREVENTDAMAGE_DROWNING)
&& !(user.isAuthorized("essentials.protect.damage.drowning") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (cause == DamageCause.LIGHTNING if (cause == DamageCause.LIGHTNING
&& prot.getSettingBool(ProtectConfig.disable_lightning) && (user.isAuthorized(Permissions.PREVENTDAMAGE_LIGHTNING)
&& !(user.isAuthorized("essentials.protect.damage.lightning") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;

12
EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java
View File

@@ -9,9 +9,15 @@ import org.bukkit.permissions.PermissionDefault;
public enum Permissions implements IPermission public enum Permissions implements IPermission
{ {
BUILD, BUILD(PermissionDefault.TRUE),
PREVENTDAMAGE_FALL, INTERACT(PermissionDefault.TRUE),
PREVENTDAMAGE_NONE USEFLINTSTEEL(PermissionDefault.TRUE),
PREVENTDAMAGE_FALL(PermissionDefault.FALSE),
PREVENTDAMAGE_SUFFOCATION(PermissionDefault.FALSE),
PREVENTDAMAGE_FIRE(PermissionDefault.FALSE),
PREVENTDAMAGE_DROWNING(PermissionDefault.FALSE),
PREVENTDAMAGE_LIGHTNING(PermissionDefault.FALSE),
PREVENTDAMAGE_NONE(PermissionDefault.FALSE)
; ;
private static final String base = "essentials.protect."; private static final String base = "essentials.protect.";
private final String permission; private final String permission;