minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-22 06:12:56 +02:00
Code Issues Releases Wiki Activity

Finished Protect, Essentials should build now.

Browse Source
This commit is contained in:
snowleo
2012-01-10 00:36:09 +01:00
parent 92abba0f25
commit d64c73fc51
7 changed files with 544 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
View File

@@ -73,31 +73,31 @@ public class EssentialsConnect
protect.getStorage().onPluginDeactivation(); protect.getStorage().onPluginDeactivation();
} }
/*for (ProtectConfig protectConfig : ProtectConfig.values()) /*
{ * for (ProtectConfig protectConfig : ProtectConfig.values()) { if (protectConfig.isList()) {
if (protectConfig.isList()) * protect.getSettingsList().put(protectConfig,
{ * ess.getSettings().getProtectList(protectConfig.getConfigName())); } else if (protectConfig.isString()) {
protect.getSettingsList().put(protectConfig, ess.getSettings().getProtectList(protectConfig.getConfigName())); * protect.getSettingsString().put(protectConfig,
} * ess.getSettings().getProtectString(protectConfig.getConfigName())); } else {
else if (protectConfig.isString()) * protect.getSettingsBoolean().put(protectConfig,
{ * ess.getSettings().getProtectBoolean(protectConfig.getConfigName(),
protect.getSettingsString().put(protectConfig, ess.getSettings().getProtectString(protectConfig.getConfigName())); * protectConfig.getDefaultValueBoolean())); }
} *
else * }
{ */
protect.getSettingsBoolean().put(protectConfig, ess.getSettings().getProtectBoolean(protectConfig.getConfigName(), protectConfig.getDefaultValueBoolean()));
}
}*/ ProtectHolder settings = protect.getSettings();
settings.acquireReadLock();
if (protect.getSettingString(ProtectConfig.datatype).equalsIgnoreCase("mysql")) try
{
if (settings.getData().getDbtype().equalsIgnoreCase("mysql"))
{ {
try try
{ {
protect.setStorage(new ProtectedBlockMySQL( protect.setStorage(new ProtectedBlockMySQL(
protect.getSettingString(ProtectConfig.mysqlDB), settings.getData().getDburl(),
protect.getSettingString(ProtectConfig.dbUsername), settings.getData().getDbuser(),
protect.getSettingString(ProtectConfig.dbPassword))); settings.getData().getDbpassword()));
} }
catch (PropertyVetoException ex) catch (PropertyVetoException ex)
{ {
@@ -115,11 +115,16 @@ public class EssentialsConnect
LOGGER.log(Level.SEVERE, null, ex); LOGGER.log(Level.SEVERE, null, ex);
} }
} }
if (protect.getSettingBool(ProtectConfig.memstore)) /*if (protect.getSettingBool(ProtectConfig.memstore))
{ {
protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect)); protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect));
} }*/
} }
finally
{
settings.unlock();
}
}
} }
} }

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

@@ -67,7 +67,7 @@ public class EssentialsProtectBlockListener extends BlockListener
final List<Block> protect = new ArrayList<Block>(); final List<Block> protect = new ArrayList<Block>();
if ((blockPlaced.getType() == Material.RAILS || blockPlaced.getType() == Material.POWERED_RAIL || blockPlaced.getType() == Material.DETECTOR_RAIL) if ((blockPlaced.getType() == Material.RAILS || blockPlaced.getType() == Material.POWERED_RAIL || blockPlaced.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isRails() && settings.getData().getSignsAndRails().isProtectRails()
&& user.isAuthorized("essentials.protect")) && user.isAuthorized("essentials.protect"))
{ {
protect.add(blockPlaced); protect.add(blockPlaced);
@@ -78,7 +78,7 @@ public class EssentialsProtectBlockListener extends BlockListener
} }
} }
if ((blockPlaced.getType() == Material.SIGN_POST || blockPlaced.getType() == Material.WALL_SIGN) if ((blockPlaced.getType() == Material.SIGN_POST || blockPlaced.getType() == Material.WALL_SIGN)
&& settings.getData().getSignsAndRails().isSigns() && settings.getData().getSignsAndRails().isProtectSigns()
&& user.isAuthorized("essentials.protect")) && user.isAuthorized("essentials.protect"))
{ {
protect.add(blockPlaced); protect.add(blockPlaced);
@@ -114,13 +114,13 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
final Block block = event.getBlock(); final Block block = event.getBlock();
if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL) if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isRails()) && settings.getData().getSignsAndRails().isProtectRails())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)
&& settings.getData().getSignsAndRails().isSigns()) && settings.getData().getSignsAndRails().isProtectSigns())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -174,13 +174,13 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
final Block toBlock = event.getToBlock(); final Block toBlock = event.getToBlock();
if ((toBlock.getType() == Material.RAILS || toBlock.getType() == Material.POWERED_RAIL || toBlock.getType() == Material.DETECTOR_RAIL) if ((toBlock.getType() == Material.RAILS || toBlock.getType() == Material.POWERED_RAIL || toBlock.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isRails()) && settings.getData().getSignsAndRails().isProtectRails())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if ((toBlock.getType() == Material.WALL_SIGN || toBlock.getType() == Material.SIGN_POST) if ((toBlock.getType() == Material.WALL_SIGN || toBlock.getType() == Material.SIGN_POST)
&& settings.getData().getSignsAndRails().isSigns()) && settings.getData().getSignsAndRails().isProtectSigns())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -201,8 +201,7 @@ public class EssentialsProtectBlockListener extends BlockListener
// TODO: Test if this still works // TODO: Test if this still works
/* /*
* if (block.getType() == Material.AIR) { * if (block.getType() == Material.AIR) {
* event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_bucket_flow)); return; * event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_bucket_flow)); return; }
}
*/ */
} }
finally finally
@@ -224,13 +223,13 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
final Block block = event.getBlock(); final Block block = event.getBlock();
if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL) if ((block.getType() == Material.RAILS || block.getType() == Material.POWERED_RAIL || block.getType() == Material.DETECTOR_RAIL)
&& settings.getData().getSignsAndRails().isRails()) && settings.getData().getSignsAndRails().isProtectRails())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) if ((block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)
&& settings.getData().getSignsAndRails().isSigns()) && settings.getData().getSignsAndRails().isProtectSigns())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -279,9 +278,13 @@ public class EssentialsProtectBlockListener extends BlockListener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
final Material type = block.getType(); final Material type = block.getType();
if (prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId)) if (settings.getData().getAlertOnBreak().contains(type))
{ {
prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke")); prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke"));
} }
@@ -353,6 +356,11 @@ public class EssentialsProtectBlockListener extends BlockListener
} }
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onBlockPistonExtend(BlockPistonExtendEvent event) public void onBlockPistonExtend(BlockPistonExtendEvent event)
@@ -361,9 +369,13 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
return; return;
} }
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
for (Block block : event.getBlocks()) for (Block block : event.getBlocks())
{ {
if (prot.checkProtectionItems(ProtectConfig.blacklist_piston, block.getTypeId())) if (settings.getData().getPrevent().getPistonPush().contains(block.getType()))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -374,12 +386,12 @@ public class EssentialsProtectBlockListener extends BlockListener
|| block.getType() == Material.POWERED_RAIL || block.getType() == Material.POWERED_RAIL
|| block.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL || block.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL
|| block.getType() == Material.DETECTOR_RAIL) || block.getType() == Material.DETECTOR_RAIL)
&& prot.getSettingBool(ProtectConfig.protect_rails)) && settings.getData().getSignsAndRails().isProtectRails())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (prot.getSettingBool(ProtectConfig.protect_signs)) if (settings.getData().getSignsAndRails().isProtectSigns())
{ {
for (BlockFace blockFace : faces) for (BlockFace blockFace : faces)
{ {
@@ -406,6 +418,11 @@ public class EssentialsProtectBlockListener extends BlockListener
} }
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onBlockPistonRetract(BlockPistonRetractEvent event) public void onBlockPistonRetract(BlockPistonRetractEvent event)
@@ -414,8 +431,12 @@ public class EssentialsProtectBlockListener extends BlockListener
{ {
return; return;
} }
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
final Block block = event.getRetractLocation().getBlock(); final Block block = event.getRetractLocation().getBlock();
if (prot.checkProtectionItems(ProtectConfig.blacklist_piston, block.getTypeId())) if (settings.getData().getPrevent().getPistonPush().contains(block.getType()))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -426,12 +447,12 @@ public class EssentialsProtectBlockListener extends BlockListener
|| block.getType() == Material.POWERED_RAIL || block.getType() == Material.POWERED_RAIL
|| block.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL || block.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL
|| block.getType() == Material.DETECTOR_RAIL) || block.getType() == Material.DETECTOR_RAIL)
&& prot.getSettingBool(ProtectConfig.protect_rails)) && settings.getData().getSignsAndRails().isProtectRails())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (prot.getSettingBool(ProtectConfig.protect_signs)) if (settings.getData().getSignsAndRails().isProtectSigns())
{ {
for (BlockFace blockFace : faces) for (BlockFace blockFace : faces)
{ {
@@ -457,4 +478,9 @@ public class EssentialsProtectBlockListener extends BlockListener
} }
} }
} }
finally
{
settings.unlock();
}
}
} }

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

@@ -3,7 +3,6 @@ package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.FakeExplosion; import com.earth2me.essentials.craftbukkit.FakeExplosion;
import java.util.Locale;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
@@ -20,6 +19,7 @@ public class EssentialsProtectEntityListener extends EntityListener
public EssentialsProtectEntityListener(final IProtect prot) public EssentialsProtectEntityListener(final IProtect prot)
{ {
super();
this.prot = prot; this.prot = prot;
this.ess = prot.getEssentialsConnect().getEssentials(); this.ess = prot.getEssentialsConnect().getEssentials();
} }
@@ -31,49 +31,47 @@ public class EssentialsProtectEntityListener extends EntityListener
{ {
return; return;
} }
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
final Entity target = event.getEntity(); final Entity target = event.getEntity();
if (target instanceof Villager && prot.getSettingBool(ProtectConfig.prevent_villager_death)) if (target instanceof Villager && settings.getData().getPrevent().isVillagerDeath())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
final IUser user = target instanceof Player ? ess.getUser((Player)target) : null; final IUser user = target instanceof Player ? ess.getUser((Player)target) : null;
if (event instanceof EntityDamageByBlockEvent) if (target instanceof Player && event instanceof EntityDamageByBlockEvent)
{ {
final DamageCause cause = event.getCause(); final DamageCause cause = event.getCause();
if (prot.getSettingBool(ProtectConfig.disable_contactdmg) if (cause == DamageCause.CONTACT
&& cause == DamageCause.CONTACT && (user.isAuthorized(Permissions.PREVENTDAMAGE_CONTACT)
&& !(target instanceof Player && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& user.isAuthorized("essentials.protect.damage.contact")
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (prot.getSettingBool(ProtectConfig.disable_lavadmg) if (cause == DamageCause.LAVA
&& cause == DamageCause.LAVA && (user.isAuthorized(Permissions.PREVENTDAMAGE_LAVADAMAGE)
&& !(target instanceof Player && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& user.isAuthorized("essentials.protect.damage.lava")
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (prot.getSettingBool(ProtectConfig.prevent_tnt_explosion) if (cause == DamageCause.BLOCK_EXPLOSION
&& cause == DamageCause.BLOCK_EXPLOSION && (user.isAuthorized(Permissions.PREVENTDAMAGE_TNT)
&& !(target instanceof Player && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& user.isAuthorized("essentials.protect.damage.tnt")
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} }
if (event instanceof EntityDamageByEntityEvent) if (target instanceof Player && event instanceof EntityDamageByEntityEvent)
{ {
final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event; final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
final Entity eAttack = edEvent.getDamager(); final Entity eAttack = edEvent.getDamager();
@@ -81,60 +79,43 @@ public class EssentialsProtectEntityListener extends EntityListener
// PVP Settings // PVP Settings
if (target instanceof Player && eAttack instanceof Player if (target instanceof Player && eAttack instanceof Player
&& prot.getSettingBool(ProtectConfig.disable_pvp) && (!user.isAuthorized(Permissions.PVP) || !attacker.isAuthorized(Permissions.PVP)))
&& (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
//Creeper explode prevention //Creeper explode prevention
if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_explosion) if (eAttack instanceof Creeper && settings.getData().getPrevent().isCreeperExplosion()
&& !(target instanceof Player || (user.isAuthorized(Permissions.PREVENTDAMAGE_CREEPER)
&& user.isAuthorized("essentials.protect.damage.creeper") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{
event.setCancelled(true);
return;
}
if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg)
&& !(target instanceof Player
&& user.isAuthorized("essentials.protect.damage.creeper")
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
&& prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg) && (user.isAuthorized(Permissions.PREVENTDAMAGE_FIREBALL)
&& !(target instanceof Player && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& user.isAuthorized("essentials.protect.damage.fireball")
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (eAttack instanceof TNTPrimed && prot.getSettingBool(ProtectConfig.prevent_tnt_playerdmg) if (eAttack instanceof TNTPrimed
&& !(target instanceof Player && (user.isAuthorized(Permissions.PREVENTDAMAGE_TNT)
&& user.isAuthorized("essentials.protect.damage.tnt") && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE)))
&& !user.isAuthorized("essentials.protect.damage.disable")))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (edEvent.getDamager() instanceof Projectile if (edEvent.getDamager() instanceof Projectile
&& target instanceof Player && ((user.isAuthorized(Permissions.PREVENTDAMAGE_PROJECTILES)
&& ((prot.getSettingBool(ProtectConfig.disable_projectiles) && !user.isAuthorized(Permissions.PREVENTDAMAGE_NONE))
&& !(user.isAuthorized("essentials.protect.damage.projectiles")
&& !user.isAuthorized("essentials.protect.damage.disable")))
|| (((Projectile)edEvent.getDamager()).getShooter() instanceof Player || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player
&& prot.getSettingBool(ProtectConfig.disable_pvp) && (!user.isAuthorized(Permissions.PVP)
&& (!user.isAuthorized("essentials.protect.pvp") || !ess.getUser((Player)((Projectile)edEvent.getDamager()).getShooter()).isAuthorized(Permissions.PVP)))))
|| !ess.getUser((Player)((Projectile)edEvent.getDamager()).getShooter()).isAuthorized("essentials.protect.pvp")))))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -183,6 +164,11 @@ public class EssentialsProtectEntityListener extends EntityListener
} }
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onEntityExplode(final EntityExplodeEvent event) public void onEntityExplode(final EntityExplodeEvent event)
@@ -191,21 +177,21 @@ public class EssentialsProtectEntityListener extends EntityListener
{ {
return; return;
} }
final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight(); final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
final int maxHeight = settings.getData().getCreeperMaxHeight();
if (event.getEntity() instanceof EnderDragon if (event.getEntity() instanceof EnderDragon
&& prot.getSettingBool(ProtectConfig.prevent_enderdragon_blockdmg)) && settings.getData().getPrevent().isEnderdragonBlockdamage())
{ {
if (prot.getSettingBool(ProtectConfig.enderdragon_fakeexplosions))
{
FakeExplosion.createExplosion(event, ess.getServer(), ess.getServer().getOnlinePlayers());
}
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
else if (event.getEntity() instanceof Creeper else if (event.getEntity() instanceof Creeper
&& (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion) && (settings.getData().getPrevent().isCreeperExplosion()
|| prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg) || settings.getData().getPrevent().isCreeperBlockdamage()
|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))) || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
{ {
//Nicccccccccce plaaacccccccccce.. //Nicccccccccce plaaacccccccccce..
@@ -214,13 +200,13 @@ public class EssentialsProtectEntityListener extends EntityListener
return; return;
} }
else if (event.getEntity() instanceof TNTPrimed else if (event.getEntity() instanceof TNTPrimed
&& prot.getSettingBool(ProtectConfig.prevent_tnt_explosion)) && settings.getData().getPrevent().isTntExplosion())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
&& prot.getSettingBool(ProtectConfig.prevent_fireball_explosion)) && settings.getData().getPrevent().isFireballExplosion())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -236,7 +222,7 @@ public class EssentialsProtectEntityListener extends EntityListener
|| block.getType() == Material.POWERED_RAIL || block.getType() == Material.POWERED_RAIL
|| block.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL || block.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL
|| block.getType() == Material.DETECTOR_RAIL) || block.getType() == Material.DETECTOR_RAIL)
&& prot.getSettingBool(ProtectConfig.protect_rails)) && settings.getData().getSignsAndRails().isProtectRails())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -248,13 +234,18 @@ public class EssentialsProtectEntityListener extends EntityListener
|| block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN || block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN
|| block.getType() == Material.SIGN_POST || block.getType() == Material.SIGN_POST
|| block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST) || block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST)
&& prot.getSettingBool(ProtectConfig.protect_signs)) && settings.getData().getSignsAndRails().isProtectSigns())
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onCreatureSpawn(final CreatureSpawnEvent event) public void onCreatureSpawn(final CreatureSpawnEvent event)
@@ -272,25 +263,26 @@ public class EssentialsProtectEntityListener extends EntityListener
{ {
return; return;
} }
final String creatureName = creature.toString().toLowerCase(Locale.ENGLISH); final ProtectHolder settings = prot.getSettings();
if (creatureName == null || creatureName.isEmpty()) settings.acquireReadLock();
try
{ {
return; final Boolean prevent = settings.getData().getPrevent().getSpawn().get(creature);
} if (prevent != null && prevent)
if (ess.getSettings().getProtectPreventSpawn(creatureName))
{ {
event.setCancelled(true); event.setCancelled(true);
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onEntityTarget(final EntityTargetEvent event) public void onEntityTarget(final EntityTargetEvent event)
{ {
if (event.isCancelled()) if (event.isCancelled() || !(event.getTarget() instanceof Player))
{
return;
}
if (!(event.getTarget() instanceof Player))
{ {
return; return;
} }
@@ -301,8 +293,7 @@ public class EssentialsProtectEntityListener extends EntityListener
|| event.getReason() == TargetReason.RANDOM_TARGET || event.getReason() == TargetReason.RANDOM_TARGET
|| event.getReason() == TargetReason.TARGET_ATTACKED_OWNER || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER
|| event.getReason() == TargetReason.OWNER_ATTACKED_TARGET) || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET)
&& prot.getSettingBool(ProtectConfig.prevent_entitytarget) && user.isAuthorized(Permissions.ENTITYTARGET))
&& !user.isAuthorized("essentials.protect.entitytarget.bypass"))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -310,26 +301,43 @@ public class EssentialsProtectEntityListener extends EntityListener
} }
@Override @Override
public void onExplosionPrime(ExplosionPrimeEvent event) public void onExplosionPrime(final ExplosionPrimeEvent event)
{
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{ {
if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
&& prot.getSettingBool(ProtectConfig.prevent_fireball_fire)) && settings.getData().getPrevent().isFireballFire())
{ {
event.setFire(false); event.setFire(false);
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onEndermanPickup(EndermanPickupEvent event) public void onEndermanPickup(final EndermanPickupEvent event)
{ {
if (event.isCancelled()) if (event.isCancelled())
{ {
return; return;
} }
if (prot.getSettingBool(ProtectConfig.prevent_enderman_pickup)) final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
if (settings.getData().getPrevent().isEndermanPickup())
{ {
event.setCancelled(true); event.setCancelled(true);
return; }
}
finally
{
settings.unlock();
} }
} }
} }

22
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
View File

@@ -28,12 +28,16 @@ public class EssentialsProtectPlayerListener extends PlayerListener
// Do not return if cancelled, because the interact event has 2 cancelled states. // Do not return if cancelled, because the interact event has 2 cancelled states.
final IUser user = ess.getUser(event.getPlayer()); final IUser user = ess.getUser(event.getPlayer());
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{
if (event.hasItem() if (event.hasItem()
&& (event.getItem().getType() == Material.WATER_BUCKET && (event.getItem().getType() == Material.WATER_BUCKET
|| event.getItem().getType() == Material.LAVA_BUCKET) || event.getItem().getType() == Material.LAVA_BUCKET)
&& prot.getSettingBool(ProtectConfig.disable_build) && !user.canBuild()) && !user.isAuthorized(Permissions.BUILD))
{ {
if (ess.getSettings().warnOnBuildDisallow()) if (settings.getData().isWarnOnBuildDisallow())
{ {
user.sendMessage(_("buildAlert")); user.sendMessage(_("buildAlert"));
} }
@@ -41,9 +45,9 @@ public class EssentialsProtectPlayerListener extends PlayerListener
return; return;
} }
if (prot.getSettingBool(ProtectConfig.disable_use) && !user.canBuild()) if (!user.isAuthorized(Permissions.INTERACT))
{ {
if (ess.getSettings().warnOnBuildDisallow()) if (settings.getData().isWarnOnBuildDisallow())
{ {
user.sendMessage(_("buildAlert")); user.sendMessage(_("buildAlert"));
} }
@@ -53,8 +57,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener
final ItemStack item = event.getItem(); final ItemStack item = event.getItem();
if (item != null if (item != null
&& prot.checkProtectionItems(ProtectConfig.blacklist_usage, item.getTypeId()) && !user.isAuthorized(ItemUsePermissions.getPermission(item.getType())))
&& !user.isAuthorized("essentials.protect.exemptusage"))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@@ -81,9 +84,14 @@ public class EssentialsProtectPlayerListener extends PlayerListener
} }
} }
if (item != null if (item != null
&& prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId())) && settings.getData().getAlertOnUse().contains(item.getType()))
{ {
prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed")); prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed"));
} }
} }
finally
{
settings.unlock();
}
}
} }

34
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
View File

@@ -17,34 +17,60 @@ public class EssentialsProtectWeatherListener extends WeatherListener
@Override @Override
public void onWeatherChange(final WeatherChangeEvent event) public void onWeatherChange(final WeatherChangeEvent event)
{
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{ {
if (!event.isCancelled() if (!event.isCancelled()
&& prot.getSettingBool(ProtectConfig.disable_weather_storm) && settings.getData().isDisableStorm()
&& event.toWeatherState()) && event.toWeatherState())
{ {
event.setCancelled(true); event.setCancelled(true);
} }
}
finally
{
settings.unlock();
}
} }
@Override @Override
public void onLightningStrike(final LightningStrikeEvent event) public void onLightningStrike(final LightningStrikeEvent event)
{
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{ {
if (!event.isCancelled() if (!event.isCancelled()
&& prot.getSettingBool(ProtectConfig.disable_weather_lightning)) && settings.getData().isDisableLighting())
{ {
event.setCancelled(true); event.setCancelled(true);
} }
} }
finally
{
settings.unlock();
}
}
@Override @Override
public void onThunderChange(final ThunderChangeEvent event) public void onThunderChange(final ThunderChangeEvent event)
{
final ProtectHolder settings = prot.getSettings();
settings.acquireReadLock();
try
{ {
if (!event.isCancelled() if (!event.isCancelled()
&& prot.getSettingBool(ProtectConfig.disable_weather_thunder) && settings.getData().isDisableThunder()
&& event.toThunderState()) && event.toThunderState())
{ {
event.setCancelled(true); event.setCancelled(true);
} }
} }
finally
{
settings.unlock();
}
}
} }

42
EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.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 ItemUsePermissions extends AbstractSuperpermsPermission{
private static Map<Material,IPermission> permissions = new EnumMap<Material, IPermission>(Material.class);
private static final String base = "essentials.protect.itemuse.";
private final String permission;
public static IPermission getPermission(Material mat)
{
IPermission perm = permissions.get(mat);
if (perm == null) {
perm = new ItemUsePermissions(mat.toString().toLowerCase(Locale.ENGLISH));
permissions.put(mat, perm);
}
return perm;
}
private ItemUsePermissions(String matName)
{
this.permission = base + matName;
}
@Override
public String getPermission()
{
return this.permission;
}
@Override
public PermissionDefault getPermissionDefault()
{
return PermissionDefault.TRUE;
}
}

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

@@ -12,13 +12,20 @@ public enum Permissions implements IPermission
BUILD(PermissionDefault.TRUE), BUILD(PermissionDefault.TRUE),
INTERACT(PermissionDefault.TRUE), INTERACT(PermissionDefault.TRUE),
USEFLINTSTEEL(PermissionDefault.TRUE), USEFLINTSTEEL(PermissionDefault.TRUE),
PVP(PermissionDefault.TRUE),
ENTITYTARGET(PermissionDefault.TRUE),
PREVENTDAMAGE_FALL(PermissionDefault.FALSE), PREVENTDAMAGE_FALL(PermissionDefault.FALSE),
PREVENTDAMAGE_CREEPER(PermissionDefault.FALSE),
PREVENTDAMAGE_CONTACT(PermissionDefault.FALSE),
PREVENTDAMAGE_FIREBALL(PermissionDefault.FALSE),
PREVENTDAMAGE_PROJECTILES(PermissionDefault.FALSE),
PREVENTDAMAGE_LAVADAMAGE(PermissionDefault.FALSE),
PREVENTDAMAGE_TNT(PermissionDefault.FALSE),
PREVENTDAMAGE_SUFFOCATION(PermissionDefault.FALSE), PREVENTDAMAGE_SUFFOCATION(PermissionDefault.FALSE),
PREVENTDAMAGE_FIRE(PermissionDefault.FALSE), PREVENTDAMAGE_FIRE(PermissionDefault.FALSE),
PREVENTDAMAGE_DROWNING(PermissionDefault.FALSE), PREVENTDAMAGE_DROWNING(PermissionDefault.FALSE),
PREVENTDAMAGE_LIGHTNING(PermissionDefault.FALSE), PREVENTDAMAGE_LIGHTNING(PermissionDefault.FALSE),
PREVENTDAMAGE_NONE(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;
private final PermissionDefault defaultPerm; private final PermissionDefault defaultPerm;