--- a/net/minecraft/world/entity/animal/horse/PathfinderGoalHorseTrap.java
+++ b/net/minecraft/world/entity/animal/horse/PathfinderGoalHorseTrap.java
@@ -43,12 +43,12 @@
         if (entitylightning != null) {
             entitylightning.moveTo(this.horse.getX(), this.horse.getY(), this.horse.getZ());
             entitylightning.setVisualOnly(true);
-            worldserver.addFreshEntity(entitylightning);
+            worldserver.strikeLightning(entitylightning, org.bukkit.event.weather.LightningStrikeEvent.Cause.TRAP); // CraftBukkit
             EntitySkeleton entityskeleton = this.createSkeleton(difficultydamagescaler, this.horse);
 
             if (entityskeleton != null) {
                 entityskeleton.startRiding(this.horse);
-                worldserver.addFreshEntityWithPassengers(entityskeleton);
+                worldserver.addFreshEntityWithPassengers(entityskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRAP); // CraftBukkit
 
                 for (int i = 0; i < 3; ++i) {
                     EntityHorseAbstract entityhorseabstract = this.createHorse(difficultydamagescaler);
@@ -59,7 +59,7 @@
                         if (entityskeleton1 != null) {
                             entityskeleton1.startRiding(entityhorseabstract);
                             entityhorseabstract.push(this.horse.getRandom().triangle(0.0D, 1.1485D), 0.0D, this.horse.getRandom().triangle(0.0D, 1.1485D));
-                            worldserver.addFreshEntityWithPassengers(entityhorseabstract);
+                            worldserver.addFreshEntityWithPassengers(entityhorseabstract, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.JOCKEY); // CraftBukkit
                         }
                     }
                 }
