mirror of
https://github.com/essentials/Essentials.git
synced 2025-09-01 18:53:27 +02:00
God mode cancel potion effects - Chris ward
Revert heal changes.
This commit is contained in:
@@ -7,6 +7,7 @@ import java.util.logging.Logger;
|
|||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Ageable;
|
import org.bukkit.entity.Ageable;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
|
import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
@@ -14,6 +15,8 @@ import org.bukkit.event.Listener;
|
|||||||
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
|
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
|
||||||
import org.bukkit.event.entity.*;
|
import org.bukkit.event.entity.*;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.potion.PotionEffect;
|
||||||
|
import org.bukkit.potion.PotionEffectType;
|
||||||
|
|
||||||
|
|
||||||
public class EssentialsEntityListener implements Listener
|
public class EssentialsEntityListener implements Listener
|
||||||
@@ -161,4 +164,15 @@ public class EssentialsEntityListener implements Listener
|
|||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
|
||||||
|
public void onPotionSplashEvent(final PotionSplashEvent event)
|
||||||
|
{
|
||||||
|
LivingEntity[] entities = event.getAffectedEntities().toArray(new LivingEntity[event.getAffectedEntities().size()]);
|
||||||
|
for(int i = 0; i < entities.length; i++)
|
||||||
|
{
|
||||||
|
if (entities[i] instanceof Player && ess.getUser(entities[i]).isGodModeEnabled())
|
||||||
|
event.setIntensity(entities[i], 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user