From 8fa606954eccd129fc136e0371e912403e8a671e Mon Sep 17 00:00:00 2001
From: MasterOfTheFish <fisher1205l@gmail.com>
Date: Sun, 20 Feb 2022 11:51:07 -0500
Subject: [PATCH] Fixed wardrobe leave / join error

---
 .../hook/item/PAPIExpansion.class             | Bin 5097 -> 5278 bytes
 .../hmccosmetics/user/Wardrobe.java           |  57 ++++++++++--------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/item/PAPIExpansion.class b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/item/PAPIExpansion.class
index 0c6a9ad0a250bfd209933f19bbc5118142e4625b..e4cc46dc9f25bc025e2dc7b7671c4d71807af5eb 100644
GIT binary patch
delta 1340
zcmb7@Yiv|i5XXOKUw6BEx4W!vmxXH6($bc)EG4=o#i+$cqNzqh5YfcCXeq_I)<Q`9
zAZwx#;|HTTYORlAt5V;4v3RLe3%*eCiO>2#@Ga^WzmZ0$a~7(Ni62bvIWu!+=09`(
zXYQf;fyU6@qdUie)A@Z{s6E&mqJevD?&A!F)wO<EcP@Wzkoy%F&jU6O@{o9XJ9@fv
zS9d7R(HSeH7t7M&cqGVx!k523-(m5H-WaS`LwX>X3_ND@I9v5t@VxRTc+%o2o2N~M
zjBbt8>ug!F`dOPhcutXMxV*7#U2bD8Bb7Td%Qy6P<vW*JI67Ze87bloQDnqsJ1^+I
zvZa9{J8VWrCdy)-Xg+tHbmZG`V~>bzoBqR}8L6^YE8m2oR!@d1^<ZSY@kMr`7?V4D
zNHT|)X4okL;`8&e?Bn|O^7(3)E|w<?yCu3p;vvB+yeiUYVQh(0yhbfv42$WK4c>Ut
z5!1si*$pJruv>PMAnxNJuZwQHZ;0F@D~LLglBIZa2B<za8ZG<-RsTPs=KT$I>hb=<
z3$|mq%yp^ycb^MqfQM)F+4NtHzQx=4%<a8(axoiJt3Dd-n{`*(yCi;-OCcLbkNXGN
zq_@TvsPpx{*z7_&5$LBT6>_<|C7cSo+|y6Ym}}#8@jjP+Clz)|wlh365`TD<UZ*9f
z9OW3$L6>#?#8ZBkM_q<TdB*saBW*a!R#j|K5fv@Tm`apng*w?ti7+&JZ=+gYFl$xe
zFc+%`m#7%aRRt?lic2MIrK;vKHIFM)9apNww5u~&U83bq%DI6P*vmWeSZ%cOu1rsW
z!_4MA(ZU?yw30U@RtN9%0YO3Y@FDvo!(lxiiN|7yTiA3JA4{?jHa%3LeZr^mNapM_
z3G`s87CvV}s69#5@&#YY9h#-#ulQO9b-&!k%+xX8H{v@WCpQ!OlX8oLx+lJ{aL}T~
zVwtjNu-I(T4o5iKVvQV3;+e!R`;>qME%PlZ#mz`UGPg|PokaMV9@%fD%pO@$JTkIk
zRY=ojj=z&tX8x38W9^~P#)V>--$Q<1DFfLtimP_8?V`%8FX3w%AEGARl<+Nad48p_
zeb)>TO2_MreXCCmPwh{;xMotlrT3d-SYwS4+DV+X%%zJa(VOWmJ<};tCCq%j=LdW%
zOu=b_MKfeducG}ZZjXR0;wOF<XhU5D?-9ZlMO7uli2D~g^l*q@MTR7Cv()|Vtkhpf
C2@T5t

delta 1217
zcma)*TWl0n7{`BSc6MiWc1m}bF6&~kxMFE7%PnRffCt6Irxs&CNr?uR>{4vV5*s54
ziR=priEm~UC^w~Q>jh;>VX0h-_X{H45!8bELP&g;q-m+&8A{j~OiX6ZcfQN{fA{^Z
zSLZrst{)!(mhtDHv(}E=ysR+Go604Nor<hC=w@fz^eW<;3q8f2P3uazQn|2hW2xw{
zoINgk+2<{cJ{*08S1k^>^m&!&Lvvntd4V?+sg^aZ?cIgv3JW$C%3TXqKHKwjxofG#
zfFkXcr={y1`U&adZI^dA=(*0)NI&nn92)9y;>J+X?N#cWcfD@3)n^dJVTslt%}j=B
z_zV%zg*hVUQO~Szu2jV?i7DruayAlW77g6RF_Fv=1V}N=`$F|ChAS@>$C*Qjqaw=%
zJcN>IUswYTsGUGI0MQRbJq2=NN_$f1Dfu_ps0PriV&pccnSZ0s{U4~cp!eJW^%C*M
zj$5(Kt3iqVM{Knyr};q2BMBRSNiH#ow#C~L-<jB)3oTAQU!{_d<VL~=D0$h$eQKfC
zk+`GKkc#vY%{WzF^!2&HADBFwd}){-e~GPp<?FY*s&w~~%!I4#uCjla*R)>w;>G80
z6=4V07!T-#3J25-YP^*u?@FSxa*aosV5Jm!m1rMRHjgWZPUZ51O7o;@=BXgpZPf7$
z)A^8(uxaN(K9<3Va9NtIWsWqpolp1_TQCeh<8!g|S;H4%XVFJDTlrF6NbWaBLba^m
z3}5LMi}0)%8d&OXzUG`HFiXYwhHs^CizJEf_+BRO2kEpPi5t2fMfa0PwopILG>h|I
z)AV_j^A<}imMe=Ei|rO`VVs=B`Z2;|7?T2HTl$+HSk#y!Z+46k8bf8cIcq<Q13hc?
z7&2<Y&5&^Q#9fd-sz+P}tReY#$i1TH`jEsQ7Mednf9EmYT+x^}Q)b&pAK6@6%3NIK
zt<{=0i+wn`<h`2TW~zb7(Oi{x_0WcbHqF!pqbQ{;$)2s3E$gC9?u(?HddKb;FEN_A
z$S+b0@yGBZQ|p!w%BZ&|&#$631Y|zHF)GlyXmx}ph*|WjCMk@lFNx5QhW;+pkwmtO
Jzds(x`~#fD>7f7s

diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
index 15a110b5..11ecb992 100644
--- a/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
+++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
@@ -216,35 +216,40 @@ public class Wardrobe extends User {
     }
 
     private void hidePlayer() {
-        final Player player = this.getPlayer();
-        if (player == null) return;
-        for (final Player p : Bukkit.getOnlinePlayers()) {
-            p.hidePlayer(this.plugin, player);
-            player.hidePlayer(this.plugin, p);
-        }
+        Bukkit.getScheduler().runTask(this.plugin,
+                () -> {
+                    final Player player = this.getPlayer();
+                    if (player == null) return;
+                    for (final Player p : Bukkit.getOnlinePlayers()) {
+                        p.hidePlayer(this.plugin, player);
+                        player.hidePlayer(this.plugin, p);
+                    }
+                });
     }
 
     private void showPlayer(final UserManager userManager) {
-        final Player player = this.getPlayer();
-        if (player == null) return;
-        final Optional<User> optionalUser = userManager.get(player.getUniqueId());
-        for (final Player p : Bukkit.getOnlinePlayers()) {
-            final Optional<User> optional = userManager.get(p.getUniqueId());
-            if (optional.isEmpty()) continue;
-            if (optional.get().getWardrobe().isActive()) continue;
-            player.showPlayer(this.plugin, p);
-            p.showPlayer(this.plugin, player);
-            Bukkit.getScheduler().runTaskLaterAsynchronously(
-                    this.plugin,
-                    () -> optional.ifPresent(user -> userManager.updateCosmetics(user, player)),
-                    1
-            );
-            Bukkit.getScheduler().runTaskLaterAsynchronously(
-                    this.plugin,
-                    () -> optionalUser.ifPresent(userManager::updateCosmetics),
-                    1
-            );
-        }
+        Bukkit.getScheduler().runTask(
+                this.plugin,
+                () -> {
+                    final Player player = this.getPlayer();
+                    if (player == null) return;
+                    final Optional<User> optionalUser = userManager.get(player.getUniqueId());
+                    for (final Player p : Bukkit.getOnlinePlayers()) {
+                        final Optional<User> optional = userManager.get(p.getUniqueId());
+                        if (optional.isEmpty()) continue;
+                        if (optional.get().getWardrobe().isActive()) continue;
+                        player.showPlayer(this.plugin, p);
+                        p.showPlayer(this.plugin, player);
+                        Bukkit.getScheduler().runTaskLaterAsynchronously(
+                                this.plugin,
+                                () -> {
+                                    optional.ifPresent(user -> userManager.updateCosmetics(user, player));
+                                    optionalUser.ifPresent(userManager::updateCosmetics);
+                                },
+                                1
+                        );
+                    }
+                });
     }
 
     @Override