diff options
author | BlackyPaw <kapilands@web.de> | 2015-06-18 14:20:01 +0200 |
---|---|---|
committer | md_5 <git@md-5.net> | 2015-06-28 08:44:27 +1000 |
commit | e91aed81b37a81a73dd89a48f53931948b896cc1 (patch) | |
tree | 6af7f97cec5a094c2e00a19c526b4d40877a8e09 /src | |
parent | d432434fd84066363fb89d58b071a81d2c50cbc0 (diff) | |
download | craftbukkit-e91aed81b37a81a73dd89a48f53931948b896cc1.tar craftbukkit-e91aed81b37a81a73dd89a48f53931948b896cc1.tar.gz craftbukkit-e91aed81b37a81a73dd89a48f53931948b896cc1.tar.lz craftbukkit-e91aed81b37a81a73dd89a48f53931948b896cc1.tar.xz craftbukkit-e91aed81b37a81a73dd89a48f53931948b896cc1.zip |
SPIGOT-986: Default back to skull ID 0 (SKELETON) whenever an invalid ID is encountered instead of throwing an AssertionError
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java index ed454f15..77f5dcc6 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -38,6 +38,7 @@ public class CraftSkull extends CraftBlockState implements Skull { static SkullType getSkullType(int id) { switch (id) { + default: case 0: return SkullType.SKELETON; case 1: @@ -48,13 +49,12 @@ public class CraftSkull extends CraftBlockState implements Skull { return SkullType.PLAYER; case 4: return SkullType.CREEPER; - default: - throw new AssertionError(id); } } static int getSkullType(SkullType type) { switch(type) { + default: case SKELETON: return 0; case WITHER: @@ -65,8 +65,6 @@ public class CraftSkull extends CraftBlockState implements Skull { return 3; case CREEPER: return 4; - default: - throw new AssertionError(type); } } |