diff options
author | md_5 <git@md-5.net> | 2017-06-02 18:28:30 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-06-02 18:28:30 +1000 |
commit | 9496c2dad17a8fdee3f879fd74a6b4f9008b4b9d (patch) | |
tree | a61788d6552e88790437a9a881a92e942bec505a /src/main/java | |
parent | e13d1196863d5dcfea3d17b79238427dfb2c61b2 (diff) | |
download | craftbukkit-9496c2dad17a8fdee3f879fd74a6b4f9008b4b9d.tar craftbukkit-9496c2dad17a8fdee3f879fd74a6b4f9008b4b9d.tar.gz craftbukkit-9496c2dad17a8fdee3f879fd74a6b4f9008b4b9d.tar.lz craftbukkit-9496c2dad17a8fdee3f879fd74a6b4f9008b4b9d.tar.xz craftbukkit-9496c2dad17a8fdee3f879fd74a6b4f9008b4b9d.zip |
SPIGOT-3284: Allow TNTPrimed#getSource to return invalid entities
Eg dead players.
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java index c493c9c0..dd9c6593 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java @@ -55,14 +55,6 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed { public Entity getSource() { EntityLiving source = getHandle().getSource(); - if (source != null) { - Entity bukkitEntity = source.getBukkitEntity(); - - if (bukkitEntity.isValid()) { - return bukkitEntity; - } - } - - return null; + return (source != null) ? source.getBukkitEntity() : null; } } |