Update Fireballs to account for ExplosionPower. Fixes BUKKIT-3460

Adds BUKKIT-3516

3 files changed, 21 insertions, 1 deletions

diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
index ac315640..beed7862 100644
--- a/src/main/java/net/minecraft/server/EntityGhast.java
+++ b/src/main/java/net/minecraft/server/EntityGhast.java
@@ -141,7 +141,8 @@ public class EntityGhast extends EntityFlying implements IMonster {
                     this.world.a((EntityHuman) null, 1008, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
                     EntityLargeFireball entitylargefireball = new EntityLargeFireball(this.world, this, d5, d6, d7);
 
-                    entitylargefireball.e = this.explosionPower;
+                    // CraftBukkit - set yield when setting explosionpower
+                    entitylargefireball.yield = entitylargefireball.e = this.explosionPower;
                     double d8 = 4.0D;
                     Vec3D vec3d = this.i(1.0F);
 
diff --git a/src/main/java/net/minecraft/server/EntityLargeFireball.java b/src/main/java/net/minecraft/server/EntityLargeFireball.java
index 88b0d84a..0aebd902 100644
--- a/src/main/java/net/minecraft/server/EntityLargeFireball.java
+++ b/src/main/java/net/minecraft/server/EntityLargeFireball.java
@@ -33,4 +33,17 @@ public class EntityLargeFireball extends EntityFireball {
             this.die();
         }
     }
+
+    public void b(NBTTagCompound nbttagcompound) {
+        super.b(nbttagcompound);
+        nbttagcompound.setInt("ExplosionPower", this.e);
+    }
+
+    public void a(NBTTagCompound nbttagcompound) {
+        super.a(nbttagcompound);
+        if (nbttagcompound.hasKey("ExplosionPower")) {
+            // CraftBukkit - set yield when setting explosionpower
+            this.yield = this.e = nbttagcompound.getInt("ExplosionPower");
+        }
+    }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
index 1ee4da21..f75e74de 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
@@ -11,6 +11,12 @@ public class CraftLargeFireball extends CraftFireball implements LargeFireball {
     }
 
     @Override
+    public void setYield(float yield) {
+        super.setYield(yield);
+        getHandle().e = (int) yield;
+    }
+
+    @Override
     public EntityLargeFireball getHandle() {
         return (EntityLargeFireball) entity;
     }