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

Fix view self disguises working wrongly

Browse Source
This commit is contained in:
libraryaddict
2017-07-23 23:47:00 +12:00
parent 6cf130b7b5
commit a00b2c7bfd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@@ -188,9 +188,9 @@ public class DisguiseAPI {
disguise.setEntity(entity); disguise.setEntity(entity);
} }
if (Disguise.getViewSelf().contains(disguise.getEntity().getUniqueId())) { disguise.setViewSelfDisguise(
disguise.setViewSelfDisguise(true); Disguise.getViewSelf().contains(disguise.getEntity().getUniqueId()) != DisguiseConfig
} .isViewDisguises());
disguise.startDisguise(); disguise.startDisguise();
} }
@@ -400,7 +400,7 @@ public class DisguiseAPI {
*/ */
public static boolean isViewSelfToggled(Entity entity) { public static boolean isViewSelfToggled(Entity entity) {
return isDisguised(entity) ? getDisguise(entity).isSelfDisguiseVisible() : return isDisguised(entity) ? getDisguise(entity).isSelfDisguiseVisible() :
!Disguise.getViewSelf().contains(entity.getUniqueId()); !Disguise.getViewSelf().contains(entity.getUniqueId()) == DisguiseConfig.isViewDisguises();
} }
/** /**
@@ -421,18 +421,18 @@ public class DisguiseAPI {
* Set whether this player can see his own disguise or not. * Set whether this player can see his own disguise or not.
* *
* @param entity * @param entity
* @param toggled * @param canSeeSelfDisguises
*/ */
public static void setViewDisguiseToggled(Entity entity, boolean toggled) { public static void setViewDisguiseToggled(Entity entity, boolean canSeeSelfDisguises) {
if (isDisguised(entity)) { if (isDisguised(entity)) {
Disguise[] disguises = getDisguises(entity); Disguise[] disguises = getDisguises(entity);
for (Disguise disguise : disguises) { for (Disguise disguise : disguises) {
disguise.setViewSelfDisguise(toggled); disguise.setViewSelfDisguise(canSeeSelfDisguises);
} }
} }
if (!toggled) { if (!canSeeSelfDisguises == DisguiseConfig.isViewDisguises()) {
if (!Disguise.getViewSelf().contains(entity.getUniqueId())) { if (!Disguise.getViewSelf().contains(entity.getUniqueId())) {
Disguise.getViewSelf().add(entity.getUniqueId()); Disguise.getViewSelf().add(entity.getUniqueId());
} }