Implemented the concept of a projectile.

1 files changed, 18 insertions, 12 deletions

diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
index 0973c990..b5ee72e3 100644
--- a/src/main/java/net/minecraft/server/EntityFireball.java
+++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -6,6 +6,8 @@ import java.util.List;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.entity.Explosive;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.EntityDamageByProjectileEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@@ -45,6 +47,11 @@ public class EntityFireball extends Entity {
         this.setPosition(this.locX, this.locY, this.locZ);
         this.height = 0.0F;
         this.motX = this.motY = this.motZ = 0.0D;
+        // CraftBukkit start (added setDirection method)
+        setDirection(d0, d1, d2);
+    }
+
+    public void setDirection(double d0, double d1, double d2) {
         d0 += this.random.nextGaussian() * 0.4D;
         d1 += this.random.nextGaussian() * 0.4D;
         d2 += this.random.nextGaussian() * 0.4D;
@@ -127,23 +134,23 @@ public class EntityFireball extends Entity {
                 if (movingobjectposition.entity != null) {
                     boolean stick;
                     if (movingobjectposition.entity instanceof EntityLiving) {
-                        CraftServer server = ((WorldServer) this.world).getServer();
-                        org.bukkit.entity.Entity shooter = (this.shooter == null) ? null : this.shooter.getBukkitEntity();
+                        CraftServer server = this.world.getServer();
                         org.bukkit.entity.Entity damagee = movingobjectposition.entity.getBukkitEntity();
-                        org.bukkit.entity.Entity projectile = this.getBukkitEntity();
+                        Projectile projectile = (Projectile) this.getBukkitEntity();
                         DamageCause damageCause = EntityDamageEvent.DamageCause.ENTITY_ATTACK;
                         int damage = 0;
 
                         // TODO @see EntityArrow#162
-                        EntityDamageByProjectileEvent event = new EntityDamageByProjectileEvent(shooter, damagee, projectile, damageCause, damage);
+                        EntityDamageByProjectileEvent event = new EntityDamageByProjectileEvent(damagee, projectile, damageCause, damage);
                         server.getPluginManager().callEvent(event);
 
-                        if (!event.isCancelled()) {
-                            // this function returns if the fireball should stick or not, i.e. !bounce
-                            stick = movingobjectposition.entity.damageEntity(this.shooter, event.getDamage());
-                        } else {
-                            // event was cancelled, get if the fireball should bounce or not
+                        this.shooter = (projectile.getShooter() == null) ? null : ((CraftLivingEntity) projectile.getShooter()).getHandle();
+
+                        if (event.isCancelled()) {
                             stick = !event.getBounce();
+                        } else {
+                            // this function returns if the fireball should stick in or not, i.e. !bounce
+                            stick = movingobjectposition.entity.damageEntity(this.shooter, event.getDamage());
                         }
                     } else {
                         stick = movingobjectposition.entity.damageEntity(this.shooter, 0);
@@ -153,7 +160,7 @@ public class EntityFireball extends Entity {
                     }
                 }
 
-                CraftServer server = ((WorldServer) this.world).getServer();
+                CraftServer server = this.world.getServer();
 
                 ExplosionPrimeEvent event = new ExplosionPrimeEvent((Explosive) CraftEntity.getEntity(server, this));
 
@@ -161,12 +168,11 @@ public class EntityFireball extends Entity {
                 if (!event.isCancelled()) {
                     // give 'this' instead of (Entity) null so we know what causes the damage
                     this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire());
-                    this.die();
                 }
                 // CraftBukkit end
             }
 
-            // this.die() // # CraftBukkit
+            this.die();
         }
 
         this.locX += this.motX;