SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Throw error if constructing watcher and something unexpected happens

Browse Source
This commit is contained in:
Andrew 2013-07-07 19:17:21 +12:00
parent bf6a526934
commit 15c1d5651b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
View File

@ -214,6 +214,7 @@ public class Disguise {
} }
public void constructWatcher(EntityType type, int entityId) { public void constructWatcher(EntityType type, int entityId) {
boolean throwError = false;
try { try {
String name; String name;
if (getType().isPlayer()) { if (getType().isPlayer()) {
@ -224,6 +225,7 @@ public class Disguise {
Class watcherClass = Class.forName("me.libraryaddict.disguise.DisguiseTypes.Watchers." + name + "Watcher"); Class watcherClass = Class.forName("me.libraryaddict.disguise.DisguiseTypes.Watchers." + name + "Watcher");
Constructor<?> contructor = watcherClass.getDeclaredConstructor(int.class); Constructor<?> contructor = watcherClass.getDeclaredConstructor(int.class);
watcher = (FlagWatcher) contructor.newInstance(entityId); watcher = (FlagWatcher) contructor.newInstance(entityId);
throwError = true;
if (watcher instanceof AgeableWatcher && this instanceof MobDisguise) { if (watcher instanceof AgeableWatcher && this instanceof MobDisguise) {
((AgeableWatcher) watcher).setValue(12, ((MobDisguise) this).isAdult() ? 0 : -23999); ((AgeableWatcher) watcher).setValue(12, ((MobDisguise) this).isAdult() ? 0 : -23999);
} }
@ -234,7 +236,9 @@ public class Disguise {
watcher.setValue(i, disguise.getValue(i)); watcher.setValue(i, disguise.getValue(i));
} }
} catch (Exception ex) { } catch (Exception ex) {
// There is no watcher for this entity if (throwError)
ex.printStackTrace();
// There is no watcher for this entity, or a error was thrown.
if (type.isAlive()) if (type.isAlive())
watcher = new LivingWatcher(entityId); watcher = new LivingWatcher(entityId);
else else