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

Merge branch 'master' into release

Browse Source
This commit is contained in:
snowleo
2011-07-16 17:04:46 +02:00
parent 34b0deba29 48230f615d
commit 9f3eb461a9
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,10 @@ public class EssentialsProtectBlockListener extends BlockListener
@Override
public void onBlockIgnite(BlockIgniteEvent event)
{
if (event.isCancelled())
{
return;
}
Block block = event.getBlock();
if (block.getType() == Material.RAILS
&& prot.getSettingBool(ProtectConfig.protect_rails))
@@ -185,6 +189,10 @@ public class EssentialsProtectBlockListener extends BlockListener
@Override
public void onBlockBurn(final BlockBurnEvent event)
{
if (event.isCancelled())
{
return;
}
final Block block = event.getBlock();
if (block.getType() == Material.RAILS && prot.getSettingBool(ProtectConfig.protect_rails))
{

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

@@ -292,6 +292,10 @@ public class EssentialsProtectEntityListener extends EntityListener
@Override
public void onEntityTarget(final EntityTargetEvent event)
{
if (event.isCancelled())
{
return;
}
if (!(event.getTarget() instanceof Player))
{
return;

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

@@ -24,6 +24,10 @@ public class EssentialsProtectPlayerListener extends PlayerListener
@Override
public void onPlayerInteract(final PlayerInteractEvent event)
{
if (event.isCancelled())
{
return;
}
final User user = ess.getUser(event.getPlayer());
if (prot.getSettingBool(ProtectConfig.disable_build) && !user.canBuild())