mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 11:44:19 +01:00
[Bleeding] Added PotionSplashEvent for splash potions. Closes BUKKIT-307
By: Zeerix <zeerix@draig.de>
This commit is contained in:
parent
f2ec9604cb
commit
b3642a04e1
3 changed files with 99 additions and 0 deletions
|
@ -795,6 +795,12 @@ public abstract class Event implements Serializable {
|
||||||
* @see org.bukkit.event.entity.ProjectileHitEvent
|
* @see org.bukkit.event.entity.ProjectileHitEvent
|
||||||
*/
|
*/
|
||||||
PROJECTILE_HIT(Category.ENTITY, ProjectileHitEvent.class),
|
PROJECTILE_HIT(Category.ENTITY, ProjectileHitEvent.class),
|
||||||
|
/**
|
||||||
|
* Called when a splash potion hits an area
|
||||||
|
*
|
||||||
|
* @see org.bukkit.event.entity.PotionSplashEvent
|
||||||
|
*/
|
||||||
|
POTION_SPLASH(Category.ENTITY, PotionSplashEvent.class),
|
||||||
/**
|
/**
|
||||||
* Called when a Slime splits into smaller Slimes upon death
|
* Called when a Slime splits into smaller Slimes upon death
|
||||||
*
|
*
|
||||||
|
|
|
@ -0,0 +1,89 @@
|
||||||
|
package org.bukkit.event.entity;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.apache.commons.lang.Validate;
|
||||||
|
import org.bukkit.entity.LivingEntity;
|
||||||
|
import org.bukkit.entity.ThrownPotion;
|
||||||
|
import org.bukkit.event.Cancellable;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when a splash potion hits an area
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("serial")
|
||||||
|
public class PotionSplashEvent extends ProjectileHitEvent implements Cancellable {
|
||||||
|
private static final HandlerList handlers = new HandlerList();
|
||||||
|
private boolean cancelled;
|
||||||
|
private Map<LivingEntity, Double> affectedEntities;
|
||||||
|
|
||||||
|
public PotionSplashEvent(ThrownPotion potion, Map<LivingEntity, Double> affectedEntities) {
|
||||||
|
super(Type.POTION_SPLASH, potion);
|
||||||
|
|
||||||
|
this.affectedEntities = affectedEntities;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the potion which caused this event
|
||||||
|
*
|
||||||
|
* @return The thrown potion entity
|
||||||
|
*/
|
||||||
|
public ThrownPotion getPotion() {
|
||||||
|
return (ThrownPotion) getEntity();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves a list of all effected entities
|
||||||
|
*
|
||||||
|
* @return A fresh copy of the affected entity list
|
||||||
|
*/
|
||||||
|
public Collection<LivingEntity> getAffectedEntities() {
|
||||||
|
return new ArrayList<LivingEntity>(affectedEntities.keySet());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the intensity of the potion's effects for given entity;
|
||||||
|
* This depends on the distance to the impact center
|
||||||
|
*
|
||||||
|
* @param entity Which entity to get intensity for
|
||||||
|
* @return intensity relative to maximum effect; 0.0: not affected; 1.0: fully hit by potion effects
|
||||||
|
*/
|
||||||
|
public double getIntensity(LivingEntity entity) {
|
||||||
|
Double intensity = affectedEntities.get(entity);
|
||||||
|
return intensity != null ? intensity : 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overwrites the intensity for a given entity
|
||||||
|
*
|
||||||
|
* @param entity For which entity to define a new intensity
|
||||||
|
* @param intensity relative to maximum effect
|
||||||
|
*/
|
||||||
|
public void setIntensity(LivingEntity entity, double intensity) {
|
||||||
|
Validate.notNull(entity, "You must specify a valid entity.");
|
||||||
|
if (intensity <= 0.0) {
|
||||||
|
affectedEntities.remove(entity);
|
||||||
|
} else {
|
||||||
|
affectedEntities.put(entity, Math.min(intensity, 1.0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isCancelled() {
|
||||||
|
return cancelled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCancelled(boolean cancel) {
|
||||||
|
cancelled = cancel;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HandlerList getHandlers() {
|
||||||
|
return handlers;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return handlers;
|
||||||
|
}
|
||||||
|
}
|
|
@ -14,6 +14,10 @@ public class ProjectileHitEvent extends EntityEvent {
|
||||||
super(Type.PROJECTILE_HIT, projectile);
|
super(Type.PROJECTILE_HIT, projectile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ProjectileHitEvent(Type type, Projectile projectile) {
|
||||||
|
super(type, projectile);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HandlerList getHandlers() {
|
public HandlerList getHandlers() {
|
||||||
return handlers;
|
return handlers;
|
||||||
|
|
Loading…
Reference in a new issue