Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2024-12-14 15:26:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't ignore config view self disguise option, fixes #502

Browse Source
This commit is contained in:
libraryaddict 2020-08-11 08:56:40 +12:00
parent 695633e876
commit 9166120071
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -837,7 +837,7 @@ public abstract class Disguise {
* @return viewSelfDisguise * @return viewSelfDisguise
*/ */
public boolean isSelfDisguiseVisible() { public boolean isSelfDisguiseVisible() {
return viewSelfDisguise; return DisguiseConfig.isViewDisguises() && viewSelfDisguise;
} }
public void setSelfDisguiseVisible(boolean selfDisguiseVisible) { public void setSelfDisguiseVisible(boolean selfDisguiseVisible) {
@ -1055,20 +1055,18 @@ public abstract class Disguise {
*/ */
@Deprecated @Deprecated
public Disguise setViewSelfDisguise(boolean viewSelfDisguise) { public Disguise setViewSelfDisguise(boolean viewSelfDisguise) {
if (viewSelfDisguise && !isTallDisguisesVisible()) { if (isSelfDisguiseVisible() == viewSelfDisguise || !DisguiseConfig.isViewDisguises()) {
setTallDisguisesVisible(true); return this;
} }
if (isSelfDisguiseVisible() != viewSelfDisguise) { this.viewSelfDisguise = viewSelfDisguise;
this.viewSelfDisguise = viewSelfDisguise;
if (getEntity() != null && getEntity() instanceof Player) { if (getEntity() != null && getEntity() instanceof Player) {
if (DisguiseAPI.getDisguise((Player) getEntity(), getEntity()) == this) { if (DisguiseAPI.getDisguise((Player) getEntity(), getEntity()) == this) {
if (isSelfDisguiseVisible()) { if (isSelfDisguiseVisible()) {
DisguiseUtilities.setupFakeDisguise(this); DisguiseUtilities.setupFakeDisguise(this);
} else { } else {
DisguiseUtilities.removeSelfDisguise(this); DisguiseUtilities.removeSelfDisguise(this);
}
} }
} }
} }