Implemented 1.6!

1 files changed, 15 insertions, 13 deletions

diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 7deabe94..62853e3a 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -67,23 +67,25 @@ public class EntityPig extends EntityAnimal {
     }
 
     public void a(EntityWeatherStorm entityweatherstorm) {
-        EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
+        if (!this.world.isStatic) {
+            EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
 
-        // CraftBukkit start
-        CraftServer server = ((WorldServer) this.world).getServer();
-        org.bukkit.entity.Entity entity = this.getBukkitEntity();
+            // CraftBukkit start
+            CraftServer server = ((WorldServer) this.world).getServer();
+            org.bukkit.entity.Entity entity = this.getBukkitEntity();
 
-        PigZapEvent event = new PigZapEvent(entity, entityweatherstorm.getBukkitEntity(), entitypigzombie.getBukkitEntity());
-        server.getPluginManager().callEvent(event);
+            PigZapEvent event = new PigZapEvent(entity, entityweatherstorm.getBukkitEntity(), entitypigzombie.getBukkitEntity());
+            server.getPluginManager().callEvent(event);
 
-        if (event.isCancelled()) {
-            return;
-        }
-        // CraftBukkit end
+            if (event.isCancelled()) {
+                return;
+            }
+            // CraftBukkit end
 
-        entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
-        this.world.addEntity(entitypigzombie);
-        this.die();
+            entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+            this.world.addEntity(entitypigzombie);
+            this.die();
+        }
     }
 
     protected void a(float f) {