diff options
| author | EvilSeph <evilseph@unaligned.org> | 2011-06-12 23:38:35 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@unaligned.org> | 2011-06-15 15:01:09 -0400 |
| commit | 6f1d6a4ca8a226b091a938b48031d42abec6ff87 (patch) | |
| tree | e591ae389568da3c039ffc835e8f165459835f65 /src/main/java/org/bukkit | |
| parent | e2c9e92d98d94931ce78c68d893c0d916fbbdf47 (diff) | |
| download | craftbukkit-6f1d6a4ca8a226b091a938b48031d42abec6ff87.tar craftbukkit-6f1d6a4ca8a226b091a938b48031d42abec6ff87.tar.gz craftbukkit-6f1d6a4ca8a226b091a938b48031d42abec6ff87.tar.lz craftbukkit-6f1d6a4ca8a226b091a938b48031d42abec6ff87.tar.xz craftbukkit-6f1d6a4ca8a226b091a938b48031d42abec6ff87.zip | |
Fixed EntityTame event.
Diffstat (limited to 'src/main/java/org/bukkit')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index a21d1365..6074d072 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -238,7 +238,7 @@ public class CraftEventFactory { */ public static EntityTameEvent callEntityTameEvent(EntityLiving entity, EntityHuman tamer) { org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity(); - org.bukkit.entity.AnimalTamer bukkitTamer = (AnimalTamer) tamer.getBukkitEntity(); + org.bukkit.entity.AnimalTamer bukkitTamer = (tamer != null ? (AnimalTamer) tamer.getBukkitEntity() : null); CraftServer craftServer = (CraftServer) bukkitEntity.getServer(); EntityTameEvent event = new EntityTameEvent(bukkitEntity, bukkitTamer); |