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

Fix potential issue with wrong disguise parameter

Browse Source
This commit is contained in:
libraryaddict 2020-04-20 22:00:51 +12:00
parent f1653c0bb0
commit e9a968fe7b
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -563,8 +563,9 @@ public abstract class Disguise {
@Deprecated @Deprecated
public Disguise setWatcher(FlagWatcher newWatcher) { public Disguise setWatcher(FlagWatcher newWatcher) {
if (!getType().getWatcherClass().isInstance(newWatcher)) { if (!getType().getWatcherClass().isInstance(newWatcher)) {
throw new IllegalArgumentException(newWatcher.getClass().getSimpleName() + " is not a instance of " + throw new IllegalArgumentException(
getType().getWatcherClass().getSimpleName() + " for DisguiseType " + getType().name()); (newWatcher == null ? "null" : newWatcher.getClass().getSimpleName()) + " is not a instance of " +
getType().getWatcherClass().getSimpleName() + " for DisguiseType " + getType().name());
} }
watcher = newWatcher; watcher = newWatcher;

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

@ -69,11 +69,11 @@ public class FlagWatcher {
FlagWatcher cloned; FlagWatcher cloned;
try { try {
cloned = getClass().getConstructor(Disguise.class).newInstance(getDisguise()); cloned = getClass().getConstructor(Disguise.class).newInstance(owningDisguise);
} }
catch (Exception e) { catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
cloned = new FlagWatcher(getDisguise()); cloned = new FlagWatcher(owningDisguise);
} }
cloned.entityValues = (HashMap<Integer, Object>) entityValues.clone(); cloned.entityValues = (HashMap<Integer, Object>) entityValues.clone();