diff options
| author | md_5 <git@md-5.net> | 2016-11-18 15:32:27 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-18 15:32:27 +1100 |
| commit | 88eede85cc3c98b3ab32d8f0cd2b9f6862758949 (patch) | |
| tree | ac79c3aca6aa1f651094c0fa3f3d9e5178e28070 /src/main | |
| parent | 8095a750e7eebc5c3d67532a8f1fa84b5a8e1976 (diff) | |
| download | craftbukkit-88eede85cc3c98b3ab32d8f0cd2b9f6862758949.tar craftbukkit-88eede85cc3c98b3ab32d8f0cd2b9f6862758949.tar.gz craftbukkit-88eede85cc3c98b3ab32d8f0cd2b9f6862758949.tar.lz craftbukkit-88eede85cc3c98b3ab32d8f0cd2b9f6862758949.tar.xz craftbukkit-88eede85cc3c98b3ab32d8f0cd2b9f6862758949.zip | |
SPIGOT-2792: Return PIG for broken spawners
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java index a5fec06b..2d070f8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java @@ -24,7 +24,8 @@ public class CraftCreatureSpawner extends CraftBlockState implements CreatureSpa } public EntityType getSpawnedType() { - return EntityType.fromName(spawner.getSpawner().getMobName().a()); + MinecraftKey key = spawner.getSpawner().getMobName(); + return (key == null) ? EntityType.PIG : EntityType.fromName(key.a()); } public void setSpawnedType(EntityType entityType) { |