diff --git a/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java b/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java index 6bbddae..2fc0df8 100644 --- a/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java +++ b/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java @@ -109,7 +109,7 @@ reg(false, org.bukkit.event.entity.HorseJumpEvent.class); reg(true, org.bukkit.event.entity.ItemDespawnEvent.class); reg(true, org.bukkit.event.entity.ItemSpawnEvent.class); - reg(false, org.bukkit.event.entity.PigZapEvent.class); + reg(true, org.bukkit.event.entity.PigZapEvent.class); reg(true, org.bukkit.event.entity.PlayerDeathEvent.class); reg(false, org.bukkit.event.entity.PlayerLeashEntityEvent.class); reg(false, org.bukkit.event.entity.PotionSplashEvent.class); diff --git a/src/main/java/org/ultramine/mods/bukkit/mixin/entity/passive/MixinEntityPig.java b/src/main/java/org/ultramine/mods/bukkit/mixin/entity/passive/MixinEntityPig.java new file mode 100644 index 0000000..fb6d08c --- /dev/null +++ b/src/main/java/org/ultramine/mods/bukkit/mixin/entity/passive/MixinEntityPig.java @@ -0,0 +1,23 @@ +package org.ultramine.mods.bukkit.mixin.entity.passive; + +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.monster.EntityPigZombie; +import net.minecraft.entity.passive.EntityPig; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +@Mixin(net.minecraft.entity.passive.EntityPig.class) +public class MixinEntityPig +{ + @Inject(method = "onStruckByLightning", locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true, + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnEntityInWorld(Lnet/minecraft/entity/Entity;)Z")) + public void onStruckByLightningInject(EntityLightningBolt p_70077_1_, CallbackInfo ci, EntityPigZombie entitypigzombie) + { + if (CraftEventFactory.callPigZapEvent((EntityPig)(Object)this, p_70077_1_, entitypigzombie).isCancelled()) + ci.cancel(); + } +} diff --git a/src/main/resources/mixin.umbukkitimpl.json b/src/main/resources/mixin.umbukkitimpl.json index 40ed590..eaf4692 100644 --- a/src/main/resources/mixin.umbukkitimpl.json +++ b/src/main/resources/mixin.umbukkitimpl.json @@ -45,6 +45,7 @@ "entity.monster.MixinEntityGhast", "entity.monster.MixinEntityCreeper", "entity.passive.MixinEntityHorse", + "entity.passive.MixinEntityPig", "entity.projectile.MixinThrowable", "entity.projectile.MixinEntityFireball", "entity.projectile.MixinEntityPotion",