diff options
author | Tahg <tahgtahv@gmail.com> | 2011-09-29 15:36:02 -0400 |
---|---|---|
committer | Tahg <tahgtahv@gmail.com> | 2011-09-29 15:36:52 -0400 |
commit | b73d095a9f189d95f45ce73dd24678a61373d92a (patch) | |
tree | adcd7152799ca41b829deb5d2d30acaa51aa6583 /src/main/java/net/minecraft/server/TileEntityMobSpawner.java | |
parent | 935313dea7bd379e59f83c70c0c8e822324f592a (diff) | |
download | craftbukkit-b73d095a9f189d95f45ce73dd24678a61373d92a.tar craftbukkit-b73d095a9f189d95f45ce73dd24678a61373d92a.tar.gz craftbukkit-b73d095a9f189d95f45ce73dd24678a61373d92a.tar.lz craftbukkit-b73d095a9f189d95f45ce73dd24678a61373d92a.tar.xz craftbukkit-b73d095a9f189d95f45ce73dd24678a61373d92a.zip |
revert change to make mobspawners drop a spawner of that type
removed some debug code
fixed a 1.5 compatibility issue
Diffstat (limited to 'src/main/java/net/minecraft/server/TileEntityMobSpawner.java')
-rw-r--r-- | src/main/java/net/minecraft/server/TileEntityMobSpawner.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityMobSpawner.java b/src/main/java/net/minecraft/server/TileEntityMobSpawner.java index 2f369456..8c3589ff 100644 --- a/src/main/java/net/minecraft/server/TileEntityMobSpawner.java +++ b/src/main/java/net/minecraft/server/TileEntityMobSpawner.java @@ -28,11 +28,10 @@ public class TileEntityMobSpawner extends TileEntity { public void setId(int id) { mobName = EntityTypes.getNameFromClass(EntityTypes.getClassFromId(id)); - if(mobName == null || mobName.isEmpty()) mobName = "Pig"; - try { - EntityTypes.a(mobName, world); + if (mobName == null || mobName.length() == 0) { + mobName = "Pig"; } - catch (Throwable t) { // If we get any error at all, fallback to a Pig + if (EntityTypes.a(mobName, world) == null) { mobName = "Pig"; } } |