mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-13 18:14:38 +02:00
Prevent blockdamage by enderdragon (default true) in EssentialsProtect CB#1566 B#1058
This commit is contained in:
@@ -32,13 +32,13 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
return;
|
||||
}
|
||||
final Entity target = event.getEntity();
|
||||
|
||||
|
||||
if (target instanceof Villager && prot.getSettingBool(ProtectConfig.prevent_villager_death))
|
||||
{
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
final User user = ess.getUser(target);
|
||||
if (event instanceof EntityDamageByBlockEvent)
|
||||
{
|
||||
@@ -197,12 +197,23 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
return;
|
||||
}
|
||||
final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight();
|
||||
//Nicccccccccce plaaacccccccccce..
|
||||
if (event.getEntity() instanceof LivingEntity
|
||||
&& (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
|
||||
|| prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg)
|
||||
|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
|
||||
|
||||
if (event.getEntity() instanceof EnderDragon
|
||||
&& prot.getSettingBool(ProtectConfig.prevent_enderdragon_blockdmg))
|
||||
{
|
||||
if (prot.getSettingBool(ProtectConfig.enderdragon_fakeexplosions))
|
||||
{
|
||||
FakeExplosion.createExplosion(event, ess.getServer(), ess.getServer().getOnlinePlayers());
|
||||
}
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
else if (event.getEntity() instanceof Creeper
|
||||
&& (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
|
||||
|| prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg)
|
||||
|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
|
||||
{
|
||||
//Nicccccccccce plaaacccccccccce..
|
||||
FakeExplosion.createExplosion(event, ess.getServer(), ess.getServer().getOnlinePlayers());
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
|
@@ -41,11 +41,13 @@ public enum ProtectConfig
|
||||
prevent_creeper_blockdmg("protect.prevent.creeper-blockdamage", false),
|
||||
prevent_enderman_pickup("protect.prevent.enderman-pickup", false),
|
||||
prevent_villager_death("protect.prevent.villager-death", false),
|
||||
prevent_enderdragon_blockdmg("protect.prevent.enderdragon-blockdamage", true),
|
||||
prevent_entitytarget("protect.prevent.entitytarget", false),
|
||||
protect_rails("protect.protect.rails", true),
|
||||
protect_below_rails("protect.protect.block-below", true),
|
||||
protect_signs("protect.protect.signs", true),
|
||||
protect_against_signs("protect.protect.block-below", true),
|
||||
enderdragon_fakeexplosions("protect.enderdragon-fakeexplosions", false),
|
||||
alert_on_placement("protect.alert.on-placement"),
|
||||
alert_on_use("protect.alert.on-use"),
|
||||
alert_on_break("protect.alert.on-break"),
|
||||
|
Reference in New Issue
Block a user