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

Instead of throwing a error then another error. Just make a FlagWatcher after the first error

Browse Source
This commit is contained in:
libraryaddict
2014-06-04 14:00:08 +12:00
parent 34f0a13b39
commit f535eefabf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@@ -181,7 +181,6 @@ public abstract class Disguise {
private int deadTicks = 0; private int deadTicks = 0;
private int refreshDisguise = 0; private int refreshDisguise = 0;
// TODO refactor
public void run() { public void run() {
// If entity is no longer valid. Remove it. // If entity is no longer valid. Remove it.
if (!getEntity().isValid()) { if (!getEntity().isValid()) {

4
src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
View File

@@ -68,10 +68,10 @@ public class FlagWatcher {
public FlagWatcher clone(Disguise owningDisguise) { public FlagWatcher clone(Disguise owningDisguise) {
FlagWatcher cloned = null; FlagWatcher cloned = null;
try { try {
cloned = getClass().getConstructor(Disguise.class).newInstance(owningDisguise); cloned = getClass().getConstructor(Disguise.class).newInstance(getDisguise());
} catch (Exception e) { } catch (Exception e) {
// TODO: This will throw NPE
e.printStackTrace(); e.printStackTrace();
cloned = new FlagWatcher(getDisguise());
} }
cloned.entityValues = (HashMap<Integer, Object>) entityValues.clone(); cloned.entityValues = (HashMap<Integer, Object>) entityValues.clone();
cloned.items = items.clone(); cloned.items = items.clone();