summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityTrackerEntry.java
diff options
context:
space:
mode:
authorsunkid <sunkid@iminurnetz.com>2011-06-18 08:10:31 -0700
committerEvilSeph <evilseph@unaligned.org>2011-06-18 22:21:02 -0400
commit155874eec9cc307814dd658acba4e27a121ca9a5 (patch)
treeb5537efc7e8768ec2fd286fe8affa971c5f85fe6 /src/main/java/net/minecraft/server/EntityTrackerEntry.java
parent546e1306d88978fcad3ddcfadaa2df6945a106d8 (diff)
downloadcraftbukkit-155874eec9cc307814dd658acba4e27a121ca9a5.tar
craftbukkit-155874eec9cc307814dd658acba4e27a121ca9a5.tar.gz
craftbukkit-155874eec9cc307814dd658acba4e27a121ca9a5.tar.lz
craftbukkit-155874eec9cc307814dd658acba4e27a121ca9a5.tar.xz
craftbukkit-155874eec9cc307814dd658acba4e27a121ca9a5.zip
Implemented the concept of a projectile.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTrackerEntry.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityTrackerEntry.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 8263af85..a980738f 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -248,7 +248,16 @@ public class EntityTrackerEntry {
return new Packet23VehicleSpawn(this.tracker, 61);
} else if (this.tracker instanceof EntityFireball) {
EntityFireball entityfireball = (EntityFireball) this.tracker;
- Packet23VehicleSpawn packet23vehiclespawn = new Packet23VehicleSpawn(this.tracker, 63, ((EntityFireball) this.tracker).shooter.id);
+ // CraftBukkit start - added check for null shooter
+ // Packet23VehicleSpawn packet23vehiclespawn = new Packet23VehicleSpawn(this.tracker, 63, ((EntityFireball) this.tracker).shooter.id);
+
+ Packet23VehicleSpawn packet23vehiclespawn;
+ if (((EntityFireball) this.tracker).shooter != null) {
+ packet23vehiclespawn = new Packet23VehicleSpawn(this.tracker, 63, ((EntityFireball) this.tracker).shooter.id);
+ } else {
+ packet23vehiclespawn = new Packet23VehicleSpawn(this.tracker, 63, 1);
+ }
+ // CraftBukkit end
packet23vehiclespawn.e = (int) (entityfireball.c * 8000.0D);
packet23vehiclespawn.f = (int) (entityfireball.d * 8000.0D);