diff options
author | nathat890 <nathat890@outlook.com> | 2018-12-05 09:36:23 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2018-12-05 09:40:15 +1100 |
commit | db06c80d7f7c8deeea1f6caf9cef549064897d05 (patch) | |
tree | 60afa8e4cc5c3191f27b2b04a4cdfc09496e383d | |
parent | e08005992786cff58eff69abd055a6e76499046e (diff) | |
download | bukkit-db06c80d7f7c8deeea1f6caf9cef549064897d05.tar bukkit-db06c80d7f7c8deeea1f6caf9cef549064897d05.tar.gz bukkit-db06c80d7f7c8deeea1f6caf9cef549064897d05.tar.lz bukkit-db06c80d7f7c8deeea1f6caf9cef549064897d05.tar.xz bukkit-db06c80d7f7c8deeea1f6caf9cef549064897d05.zip |
Add list of entities to EntityTransformEvent
-rw-r--r-- | src/main/java/org/bukkit/event/entity/EntityTransformEvent.java | 20 | ||||
-rw-r--r-- | src/main/java/org/bukkit/event/entity/PigZapEvent.java | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java b/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java index 44ba1005..fb5e33b9 100644 --- a/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java @@ -1,5 +1,7 @@ package org.bukkit.event.entity; +import java.util.Collections; +import java.util.List; import org.bukkit.Warning; import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; @@ -17,24 +19,38 @@ public class EntityTransformEvent extends EntityEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancelled; private final Entity converted; + private final List<Entity> convertedList; private final TransformReason transformReason; - public EntityTransformEvent(Entity original, Entity converted, TransformReason transformReason) { + public EntityTransformEvent(Entity original, List<Entity> convertedList, TransformReason transformReason) { super(original); - this.converted = converted; + this.convertedList = Collections.unmodifiableList(convertedList); + this.converted = convertedList.get(0); this.transformReason = transformReason; } /** * Gets the entity that the original entity was transformed to. * + * This returns the first entity in the transformed entity list. + * * @return The transformed entity. + * @see #getTransformedEntities() */ public Entity getTransformedEntity() { return converted; } /** + * Gets the entities that the original entity was transformed to. + * + * @return The transformed entities. + */ + public List<Entity> getTransformedEntities() { + return convertedList; + } + + /** * Gets the reason for the conversion that has occurred. * * @return The reason for conversion that has occurred. diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java index 86983676..c1d4b30a 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -1,5 +1,7 @@ package org.bukkit.event.entity; +import java.util.Collections; +import org.bukkit.entity.Entity; import org.bukkit.entity.LightningStrike; import org.bukkit.entity.Pig; import org.bukkit.entity.PigZombie; @@ -16,7 +18,7 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable { private final LightningStrike bolt; public PigZapEvent(final Pig pig, final LightningStrike bolt, final PigZombie pigzombie) { - super(pig, pigzombie, TransformReason.LIGHTNING); + super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING); this.bolt = bolt; this.pigzombie = pigzombie; } |