Prevent potion effects for protected NPCs

CitizensDev · Mar 9, 2018 · d7237df · d7237df
1 parent e3f339b
commit d7237df
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -13,6 +13,7 @@
 import org.bukkit.entity.AbstractHorse;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.FishHook;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -28,6 +29,7 @@
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.entity.PlayerLeashEntityEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerFishEvent;
@@ -473,6 +475,18 @@ public void run() {
         skinUpdateTracker.updatePlayer(event.getPlayer(), 15, true);
     }
 
+    @EventHandler(ignoreCancelled = true)
+    public void onPotionSplashEvent(PotionSplashEvent event) {
+        for (LivingEntity entity : event.getAffectedEntities()) {
+            NPC npc = npcRegistry.getNPC(entity);
+            if (npc == null)
+                continue;
+            if (npc.isProtected()) {
+                event.setIntensity(entity, 0);
+            }
+        }
+    }
+
     @EventHandler(ignoreCancelled = true)
     public void onProjectileHit(final ProjectileHitEvent event) {
         if (!(event.getEntity() instanceof FishHook))

diff --git a/main/src/main/java/net/citizensnpcs/trait/Gravity.java b/main/src/main/java/net/citizensnpcs/trait/Gravity.java
@@ -38,4 +38,4 @@ public void run() {
     public boolean toggle() {
         return enabled = !enabled;
     }
-}
+}