diff --git a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java b/src/main/java/net/minecraft/entity/projectile/EntityPotion.java index 88e085f..e7baece 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityPotion.java @@ -110,6 +110,9 @@ { d1 = 1.0D; } + + if(net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new org.ultramine.server.event.EntityPotionApplyEffectEvent(this, entitylivingbase, list))) + continue; Iterator iterator1 = list.iterator(); diff --git a/src/main/java/org/ultramine/server/event/EntityPotionApplyEffectEvent.java b/src/main/java/org/ultramine/server/event/EntityPotionApplyEffectEvent.java new file mode 100644 index 0000000..b92eb82 --- /dev/null +++ b/src/main/java/org/ultramine/server/event/EntityPotionApplyEffectEvent.java @@ -0,0 +1,25 @@ +package org.ultramine.server.event; + +import java.util.List; + +import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityPotion; +import net.minecraft.potion.PotionEffect; +import net.minecraftforge.event.entity.EntityEvent; + +@Cancelable +public class EntityPotionApplyEffectEvent extends EntityEvent +{ + public final EntityPotion entityPotion; + public final EntityLivingBase living; + public List effects; + + public EntityPotionApplyEffectEvent(EntityPotion entity, EntityLivingBase living, List effects) + { + super(entity); + this.entityPotion = entity; + this.living = living; + this.effects = effects; + } +}