summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityPig.patch
blob: ba054dda942bf93deb2031c6101a4b39e41187f2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
--- /home/matt/mc-dev-private//net/minecraft/server/EntityPig.java	2015-02-26 22:40:22.647608139 +0000
+++ src/main/java/net/minecraft/server/EntityPig.java	2015-02-26 22:40:22.647608139 +0000
@@ -1,5 +1,7 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
 public class EntityPig extends EntityAnimal {
 
     private final PathfinderGoalPassengerCarrotStick bm;
@@ -112,6 +114,12 @@
         if (!this.world.isClientSide && !this.dead) {
             EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
 
+            // CraftBukkit start
+            if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+                return;
+            }
+            // CraftBukkit end
+
             entitypigzombie.setEquipment(0, new ItemStack(Items.GOLDEN_SWORD));
             entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
             entitypigzombie.k(this.ce());
@@ -120,7 +128,8 @@
                 entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
             }
 
-            this.world.addEntity(entitypigzombie);
+            // CraftBukkit - added a reason for spawning this creature
+            this.world.addEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
             this.die();
         }
     }