Add potion_splash event (Closes #791)

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntity.java

@@ -322,4 +322,18 @@ public boolean removeScoreboardTag(String tag) {
 		return e.removeScoreboardTag(tag);
 	}
 
+	@Override
+	public String toString() {
+		return e.toString();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return obj instanceof BukkitMCEntity && e.equals(((BukkitMCEntity) obj).getHandle());
+	}
+
+	@Override
+	public int hashCode() {
+		return e.hashCode();
+	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntityProjectileSource.java

@@ -55,19 +55,4 @@ public MCProjectile launchProjectile(MCEntityType projectile, Vector3D init) {
 			return null;
 		}
 	}
-
-	@Override
-	public String toString() {
-		return eps.toString();
-	}
-
-	@Override
-	public int hashCode() {
-		return eps.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return eps.equals(obj);
-	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitEntityEvents.java

@@ -6,6 +6,7 @@
 import com.laytonsmith.abstraction.MCEntity;
 import com.laytonsmith.abstraction.blocks.MCBlockData;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlockData;
+import com.laytonsmith.abstraction.bukkit.entities.BukkitMCThrownPotion;
 import com.laytonsmith.abstraction.entities.MCHanging;
 import com.laytonsmith.abstraction.entities.MCItem;
 import com.laytonsmith.abstraction.MCItemStack;
@@ -28,6 +29,7 @@
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCPlayer;
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCProjectile;
 import com.laytonsmith.abstraction.entities.MCFirework;
+import com.laytonsmith.abstraction.entities.MCThrownPotion;
 import com.laytonsmith.abstraction.enums.MCDamageCause;
 import com.laytonsmith.abstraction.enums.MCEntityType;
 import com.laytonsmith.abstraction.enums.MCEquipmentSlot;
@@ -112,9 +114,10 @@
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
+
 import org.bukkit.event.entity.EntityUnleashEvent;
 
 public class BukkitEntityEvents {
@@ -289,13 +292,11 @@ public MCEntityType getEntityType() {
 	}
 
 	@abstraction(type = Implementation.Type.BUKKIT)
-	public static class BukkitMCPotionSplashEvent extends BukkitMCProjectileHitEvent
-			implements MCPotionSplashEvent {
+	public static class BukkitMCPotionSplashEvent implements MCPotionSplashEvent {
 
 		PotionSplashEvent pse;
 
 		public BukkitMCPotionSplashEvent(Event event) {
-			super(event);
 			pse = (PotionSplashEvent) event;
 		}
 
@@ -305,17 +306,17 @@ public Object _GetObject() {
 		}
 
 		@Override
-		public Set<MCLivingEntity> getAffectedEntities() {
-			Set<MCLivingEntity> ret = new HashSet<>();
-			for(LivingEntity le : pse.getAffectedEntities()) {
-				ret.add((MCLivingEntity) BukkitConvertor.BukkitGetCorrectEntity(le));
-			}
-			return ret;
+		public MCThrownPotion getEntity() {
+			return new BukkitMCThrownPotion(pse.getEntity());
 		}
 
 		@Override
-		public double getIntensity(MCLivingEntity le) {
-			return pse.getIntensity(((BukkitMCLivingEntity) le).asLivingEntity());
+		public Map<MCLivingEntity, Double> getAffectedEntities() {
+			Map<MCLivingEntity, Double> ret = new HashMap<>();
+			for(LivingEntity le : pse.getAffectedEntities()) {
+				ret.put(new BukkitMCLivingEntity(le), pse.getIntensity(le));
+			}
+			return ret;
 		}
 
 		@Override

src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitEntityListener.java

@@ -23,6 +23,7 @@
 import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerInteractAtEntityEvent;
 import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerInteractEntityEvent;
 import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerPickupItemEvent;
+import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPotionSplashEvent;
 import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCProjectileHitEvent;
 import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCProjectileLaunchEvent;
 import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCTargetEvent;
@@ -52,6 +53,7 @@
 import org.bukkit.event.entity.ItemDespawnEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.hanging.HangingBreakEvent;
@@ -222,4 +224,10 @@ public void onEntityUnleash(EntityUnleashEvent event) {
 		BukkitMCEntityUnleashEvent epe = new BukkitMCEntityUnleashEvent(event);
 		EventUtils.TriggerListener(Driver.ENTITY_UNLEASH, "entity_unleash", epe);
 	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPotionSplash(PotionSplashEvent event) {
+		BukkitMCPotionSplashEvent pse = new BukkitMCPotionSplashEvent(event);
+		EventUtils.TriggerListener(Driver.POTION_SPLASH, "potion_splash", pse);
+	}
 }

src/main/java/com/laytonsmith/abstraction/events/MCPotionSplashEvent.java

@@ -1,13 +1,16 @@
 package com.laytonsmith.abstraction.events;
 
+import com.laytonsmith.abstraction.entities.MCThrownPotion;
 import com.laytonsmith.abstraction.MCLivingEntity;
-import java.util.Set;
+import com.laytonsmith.core.events.BindableEvent;
 
-public interface MCPotionSplashEvent extends MCProjectileHitEvent {
+import java.util.Map;
 
-	Set<MCLivingEntity> getAffectedEntities();
+public interface MCPotionSplashEvent extends BindableEvent {
 
-	double getIntensity(MCLivingEntity le);
+	MCThrownPotion getEntity();
+
+	Map<MCLivingEntity, Double> getAffectedEntities();
 
 	void setIntensity(MCLivingEntity le, double intensity);
 }

src/main/java/com/laytonsmith/core/events/drivers/EntityEvents.java

@@ -17,6 +17,7 @@
 import com.laytonsmith.abstraction.blocks.MCBlockProjectileSource;
 import com.laytonsmith.abstraction.blocks.MCMaterial;
 import com.laytonsmith.abstraction.entities.MCFirework;
+import com.laytonsmith.abstraction.entities.MCThrownPotion;
 import com.laytonsmith.abstraction.enums.MCDamageCause;
 import com.laytonsmith.abstraction.enums.MCEntityType;
 import com.laytonsmith.abstraction.enums.MCEquipmentSlot;
@@ -47,6 +48,7 @@
 import com.laytonsmith.abstraction.events.MCPlayerInteractAtEntityEvent;
 import com.laytonsmith.abstraction.events.MCPlayerInteractEntityEvent;
 import com.laytonsmith.abstraction.events.MCPlayerPickupItemEvent;
+import com.laytonsmith.abstraction.events.MCPotionSplashEvent;
 import com.laytonsmith.abstraction.events.MCProjectileHitEvent;
 import com.laytonsmith.abstraction.events.MCProjectileLaunchEvent;
 import com.laytonsmith.annotations.api;
@@ -2295,4 +2297,88 @@ public Version since() {
 			return MSVersion.V3_3_4;
 		}
 	}
+
+	@api
+	public static class potion_splash extends AbstractEvent {
+
+		@Override
+		public String getName() {
+			return "potion_splash";
+		}
+
+		@Override
+		public String docs() {
+			return "{id: <string match> The splash potion entity uuid.}"
+					+ " Called when a splash potion lands."
+					+ " {id | entities: An associative array of living entities affected by the splash, where the key"
+					+ " is a UUID and the value is a double with a range of 0.0 - 1.0 for the intensity of the effect.}"
+					+ " {entities: Set an entity's intensity to 0 to make them unaffected.}";
+		}
+
+		@Override
+		public boolean matches(Map<String, Mixed> prefilter, BindableEvent event) throws PrefilterNonMatchException {
+			if(event instanceof MCPotionSplashEvent) {
+				MCPotionSplashEvent e = (MCPotionSplashEvent) event;
+				Prefilters.match(prefilter, "id", e.getEntity().getUniqueId().toString(), PrefilterType.STRING_MATCH);
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		public BindableEvent convert(CArray manualObject, Target t) {
+			return null;
+		}
+
+		@Override
+		public Map<String, Mixed> evaluate(BindableEvent e) throws EventException {
+			if(e instanceof MCPotionSplashEvent) {
+				MCPotionSplashEvent event = (MCPotionSplashEvent) e;
+				Target t = Target.UNKNOWN;
+				Map<String, Mixed> ret = evaluate_helper(e);
+				MCThrownPotion pot = event.getEntity();
+
+				ret.put("id", new CString(pot.getUniqueId().toString(), t));
+				CArray affected = CArray.GetAssociativeArray(t);
+				for(Map.Entry<MCLivingEntity, Double> entry : event.getAffectedEntities().entrySet()) {
+					affected.set(entry.getKey().getUniqueId().toString(), new CDouble(entry.getValue(), t), t);
+				}
+				ret.put("entities", affected);
+				return ret;
+			} else {
+				throw new EventException("Could not convert to MCPotionSplashEvent");
+			}
+		}
+
+		@Override
+		public Driver driver() {
+			return Driver.POTION_SPLASH;
+		}
+
+		@Override
+		public boolean modifyEvent(String key, Mixed value, BindableEvent event) {
+			if(event instanceof MCPotionSplashEvent) {
+				MCPotionSplashEvent splashEvent = (MCPotionSplashEvent) event;
+				Target t = value.getTarget();
+
+				if(key.equalsIgnoreCase("entities")) {
+					CArray array = ArgumentValidation.getArray(value, t);
+					if(!array.isAssociative()) {
+						throw new CRECastException("Expected array to be associative.", t);
+					}
+					for(String id : array.stringKeySet()) {
+						MCLivingEntity entity = Static.getLivingByUUID(Static.GetUUID(id, t), t);
+						splashEvent.setIntensity(entity, ArgumentValidation.getDouble(array.get(id, t), t));
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public Version since() {
+			return MSVersion.V3_3_4;
+		}
+	}
 }