mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-12 12:23:59 +00:00
Merge branch 'master' into release
This commit is contained in:
commit
9f3eb461a9
3 changed files with 16 additions and 0 deletions
|
@ -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))
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue