From f3b780e730d85643a920fdbb5ab89dde228976f7 Mon Sep 17 00:00:00 2001 From: MasterOfTheFish Date: Sun, 20 Feb 2022 12:05:30 -0500 Subject: [PATCH] Fixed concurrent error --- .../hmccosmetics/task/TaskManager.class | Bin 2694 -> 2716 bytes .../hmccosmetics/user/Wardrobe.class | Bin 13168 -> 13574 bytes .../hmccosmetics/task/TaskManager.java | 3 ++- .../hmccosmetics/user/Wardrobe.java | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class index ab707f6928e02445ebfd85dcf2f0f56e5ddf0e88..f357f5246d716b6fbcd9f11fee4619143b562c0b 100644 GIT binary patch delta 130 zcmZn@og+HIPFpK0u`E%)v?Mb}KRG`yxwNP#HLpb98P4>{%*#$q2`o)5P2CvG$-yhg zz{0=}ghC7=48oH$Iigs_7$g|vC!gSOW>sR~W>B6iz*#7$#=yy-&Y;Gi!JxyS$)L}m ZHF*+e5~IZAubeKdk_>DNQj_htJOH1FAGZJi delta 108 zcmbOu+9o=|PE;f-u`E%)v?Mb}-zPIKJ2k~8v$$kqCMO5400RpH9|J#wAcF{l(ByiK zC{|Gh2?n{z_c)wc6&bi0lqRcj77D5|a5AU?p*n*Og9d{>gXZKFoJox0lexKESS1+P L7$hf$aCra#eNGk_ diff --git a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class index 66034a575444d2f8df748e33ea1302a5876df413..94cc134e58227381f3980f8adfbdedf89033dcd2 100644 GIT binary patch delta 4602 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 delta 4157 zcmZ`*X<$^<75>g_Z&%czwU z#VUBUhys=ti&Sh`WJrQwR4PjW#RY6t)K-NGR;#wP3gWr3MPg3ZBY4HYs{*U>8lj)u;>(l1Y=?X|&5(_WA@5NfGw_DMU-*hSzU<_qcvJ12 z>VXY!3mnHga*c0P$$J8S!ybZrcGDF#&9mo6)GhA|e4y`cnl*R9xZ0{kk$K5*;)K9( zoFpvFm&IABa&}UMZ1koJ7d}!8rwCKdFAR`(cTJ~{<+`o|eW$U)gHQ1<1D^?ejxXfK zpqIF1ir=@S(n^5A(`F!joNgMP$#ElT_dkd&T=0i z5@aL0tV*d#@Q{;S1{s3f)J2|5DHC30W5l2YLZMuDNg)SfCM62;QIedII>nVDD3$#3 zKx&mMT~G!EWU)Ws>Mp1UZy4v#=$R>~7iAIbO_64fM*ir6i3;KpLA|MuT;i{AbGRv2 zP@cR!EyGnHC`ci>Hm$-_$WEh634`+Gip&8*opV!>pknGLOVY=889)OKDiJhDE>9on z?m|Cer%|aqo?g$9y_JRtx{QX()`Tg2JSd`aL071_BywD87gQ~38Zo=6fg_p-Co(J0;`*te zpRpyI0zDm*1YIi+1-dyVGuO7A3aoV4s6l4;>Lc&W94W8rRVVjmRyqe0u8zmGN5Mow zN^MnL_4KMf7ueBf5Fv7YQ$@xPY$}mAWVOpF*=gH`XM1g3f9IhM^n^hh1^u3$+;)9$ zH{JLLW#1nKt)n%GPTHbITLnEvzvj`?YP4O@YQ45YjamggOsjmD%F8>|#500^MJs)@ zGSNlPs)-Ik%V`CVo>!w61l>pX`{+*uzdVwhnlh0O?)BgZ?NhAUPZ*%0moFP~yoQfB z{fg8$TwGQ#kueS_jKhK+AjzYb)#!+zwX}vHM%ULz<_)i{YHEr!8T6WbG$-gdO30LJ zb28=w5rts?Z=)&JT znu;F$X9->i#!_?B;Nx^wQWa8R*Q<#<=g@Q2RKr=TR;Tl-ORuJ|r0&e~AsrcGHs`7y~ z^WYABf0ns5e!rLMGxYs@p6{Q_+ld-1=N!);bhQFW(@NjPIxgWztwAsT=isqUfVpwN zT#8usbhqrW;VuhrTEQ5)K|WQ`eYlFT>58)W$ug?fC*9~zjWmxnNka}b=@?&%1Zt+6 z*ixG+U^;Z(;3cCjm>5F>c68DxDUO>&^BF^NCrP8(v^VXb1cq6FJsRw$V2Sh(JgeV)^}_uUF&PccOM66f2ZqQ@#|cg@k-^}C~93dlvPqH zyMm$Z7<@5T4l>rEAHXU_nNpQ*=d`s~YWq#y0jHwg=8If#-T6+^;-PSH5l3B_$i!?$lLl zqf&lsSScT3T@Mmsc)8-d9i@(d!?NT~C7Gs_Izs{H`MssCfGdXASHZR6-0MpGYX@vG zycNT{dhR(@HVn1@?{)-KAdPTaR1I3upqE^sa63NaYSM;VoS0-y7lzvLkND(v{JH6C=P_uzGt9YKdU0@RFt}Eg*)b^`qsvzz zBN&chpxVjBRuzO`C`Q99)A-(D+y((lxu)L3t<_Q_<37%W`?DhT(1WTUyWm z8Sv2KoQIp}sapP+;^w%tEiT0@sg2rcm$h$qeDyg?+CwkW0lm714qDPCdWlzG;mbT6 Ly;tdVI)=cv6xa7h diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java index 60c70837..b620cca1 100644 --- a/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java +++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java @@ -6,12 +6,13 @@ import org.bukkit.scheduler.BukkitTask; import java.util.LinkedList; import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; public class TaskManager { private final HMCCosmetics plugin; private BukkitTask timer; - private final Queue tasks = new LinkedList<>(); + private final Queue tasks = new ConcurrentLinkedQueue<>(); public TaskManager(final HMCCosmetics plugin) { this.plugin = plugin; 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 11ecb992..f0e35e07 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 @@ -15,7 +15,6 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; -import javax.swing.text.html.Option; import java.util.Optional; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; @@ -135,7 +134,8 @@ public class Wardrobe extends User { () -> { PacketManager.sendPacket( viewer, - PacketManager.getEntityDestroyPacket(this.getEntityId()) + PacketManager.getEntityDestroyPacket(this.getEntityId()), + PacketManager.getRemovePlayerPacket(viewer, this.id, this.getEntityId()) // for spectator packets // PacketManager.getEntityDestroyPacket(this.viewerId) );