TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Add SmallFireball to EssProtect

Browse source
This commit is contained in:
snowleo 2011-11-20 15:43:39 +01:00
parent 8c478c76a5
commit a886645afa
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View file

@ -20,6 +20,7 @@ import org.bukkit.entity.Fireball;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.SmallFireball;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EndermanPickupEvent;
@ -121,7 +122,8 @@ public class EssentialsProtectEntityListener extends EntityListener
return;
}
if (eAttack instanceof Fireball && prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg)
if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
&& prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg)
&& !(target instanceof Player
&& user.isAuthorized("essentials.protect.damage.fireball")
&& !user.isAuthorized("essentials.protect.damage.disable")))
@ -259,7 +261,7 @@ public class EssentialsProtectEntityListener extends EntityListener
event.setCancelled(true);
return;
}
else if (event.getEntity() instanceof Fireball
else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
&& prot.getSettingBool(ProtectConfig.prevent_fireball_explosion))
{
event.setCancelled(true);
@ -347,7 +349,7 @@ public class EssentialsProtectEntityListener extends EntityListener
@Override
public void onExplosionPrime(ExplosionPrimeEvent event)
{
if (event.getEntity() instanceof Fireball
if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
&& prot.getSettingBool(ProtectConfig.prevent_fireball_fire))
{
event.setFire(false);
@ -357,10 +359,12 @@ public class EssentialsProtectEntityListener extends EntityListener
@Override
public void onEndermanPickup(EndermanPickupEvent event)
{
if (event.isCancelled()) {
if (event.isCancelled())
{
return;
}
if (prot.getSettingBool(ProtectConfig.prevent_enderman_pickup)) {
if (prot.getSettingBool(ProtectConfig.prevent_enderman_pickup))
{
event.setCancelled(true);
return;
}