From e8c7a48c47cf34702d64565020e942a258dd22bf Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 10 May 2020 16:38:36 +1200 Subject: [PATCH] Added setUpsideDown to PlayerWatcher --- .../disguise/disguisetypes/PlayerDisguise.java | 2 +- .../disguise/disguisetypes/watchers/PlayerWatcher.java | 8 ++++++++ .../disguise/utilities/params/ParamInfoManager.java | 4 ---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java index 23e89c46..f29b8209 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java @@ -199,7 +199,7 @@ public class PlayerDisguise extends TargetedDisguise { this.upsideDown = upsideDown; if (isDisguiseInUse()) { - resendDisguise(getName(), true); + resendDisguise(DisguiseConfig.isArmorstandsName() ? getName() : "Dinnerbone", true); } else { scoreboardName = null; } diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java index a8dad3dc..6ce8a424 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java @@ -37,6 +37,14 @@ public class PlayerWatcher extends LivingWatcher { ((PlayerDisguise) getDisguise()).setNameVisible(nameVisible); } + public boolean isUpsideDown() { + return ((PlayerDisguise) getDisguise()).isUpsideDown(); + } + + public void setUpsideDown(boolean upsideDown) { + ((PlayerDisguise) getDisguise()).setUpsideDown(upsideDown); + } + @RandomDefaultValue public String getName() { return ((PlayerDisguise) getDisguise()).getName(); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoManager.java b/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoManager.java index 4a8ce0db..bab219a3 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoManager.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoManager.java @@ -145,10 +145,6 @@ public class ParamInfoManager { if (watcherClass == PlayerWatcher.class) { try { methods.add(PlayerDisguise.class.getMethod("setDynamicName", boolean.class)); - - if (DisguiseConfig.isArmorstandsName()) { - methods.add(PlayerDisguise.class.getMethod("setUpsideDown", boolean.class)); - } } catch (NoSuchMethodException e) { e.printStackTrace();