From 2db5be7d5653b04d83ab0b15bdb962d91c262b61 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Tue, 11 Jan 2022 02:58:00 +0100 Subject: [PATCH] UpdateAPI bug When joining the server, it could happen that an error occurred, because the UpdateChecker had not yet checked the public version. --- ...{T2CodeLib_10_1.xml => T2CodeLib_10_2.xml} | 4 ++-- pom.xml | 2 +- .../lib/Spigot/Lib/update/UpdateAPI.java | 5 ++--- .../net/t2code/lib/Spigot/system/Main.java | 1 - target/classes/bungee.yml | 2 +- .../lib/Spigot/Lib/update/UpdateAPI$1.class | Bin 986 -> 986 bytes .../lib/Spigot/Lib/update/UpdateAPI$2.class | Bin 1417 -> 1417 bytes .../lib/Spigot/Lib/update/UpdateAPI$3$1.class | Bin 1412 -> 1412 bytes .../lib/Spigot/Lib/update/UpdateAPI$3.class | Bin 3746 -> 3746 bytes .../lib/Spigot/Lib/update/UpdateAPI.class | Bin 9922 -> 9911 bytes .../net/t2code/lib/Spigot/system/Main.class | Bin 6950 -> 6950 bytes target/classes/plugin.yml | 2 +- 12 files changed, 7 insertions(+), 9 deletions(-) rename .idea/artifacts/{T2CodeLib_10_1.xml => T2CodeLib_10_2.xml} (63%) diff --git a/.idea/artifacts/T2CodeLib_10_1.xml b/.idea/artifacts/T2CodeLib_10_2.xml similarity index 63% rename from .idea/artifacts/T2CodeLib_10_1.xml rename to .idea/artifacts/T2CodeLib_10_2.xml index 7db3d92..d29a681 100644 --- a/.idea/artifacts/T2CodeLib_10_1.xml +++ b/.idea/artifacts/T2CodeLib_10_2.xml @@ -1,7 +1,7 @@ - + $PROJECT_DIR$/../../Plugins/T2CodeLib/.jar - + diff --git a/pom.xml b/pom.xml index 91ad358..b795675 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 10.1 + 10.2 jar T2CodeLib diff --git a/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java b/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java index d2313dc..56e8221 100644 --- a/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java +++ b/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java @@ -26,18 +26,17 @@ public class UpdateAPI { public static void join(Plugin plugin, String prefix, String perm, Player player, String spigot, String discord) { String pluginVersion = plugin.getDescription().getVersion(); - String publicVersion = UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion; if (!player.hasPermission(perm) || !player.isOp()) { return; } - if (publicVersion == null) { + if (UpdateAPI.PluginVersionen.get(plugin.getName()) == null) { new BukkitRunnable() { @Override public void run() { join(plugin, prefix, perm, player, spigot, discord); } }.runTaskLater(plugin, 20L); - } else use(plugin, prefix, player, pluginVersion, publicVersion, spigot, discord); + } else use(plugin, prefix, player, pluginVersion, UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion, spigot, discord); } private static void use(Plugin plugin, String prefix, Player player, String pluginVersion, String publicVersion, String spigot, String discord) { diff --git a/src/main/java/net/t2code/lib/Spigot/system/Main.java b/src/main/java/net/t2code/lib/Spigot/system/Main.java index f362a0f..c933349 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/Main.java +++ b/src/main/java/net/t2code/lib/Spigot/system/Main.java @@ -21,7 +21,6 @@ import org.bukkit.plugin.java.JavaPlugin; import java.io.File; import java.util.List; -import java.util.Objects; public final class Main extends JavaPlugin { diff --git a/target/classes/bungee.yml b/target/classes/bungee.yml index 452343e..162f2f3 100644 --- a/target/classes/bungee.yml +++ b/target/classes/bungee.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 10.1 +version: 10.2 main: net.t2code.lib.Bungee.BMain author: JaTiTV, Jkobs description: Libarie from T2Code Plugins \ No newline at end of file diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$1.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$1.class index 41eb840817dc0faa397eaf5f663084e2efc3d571..a2f2a0fbff89c419f241d589a257645446e881e2 100644 GIT binary patch delta 23 ecmcb`ev5sBH#4K+WFO{WRuu+m2Gz++n9TrEI0f+l delta 23 ecmcb`ev5sBH#4KsWFO{WR#gUR2DQmcn9TrERR#0_ diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$2.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$2.class index 45e56786753425ba03153daea109a6fa8b936d40..84769dcf7ee6ac0959ec31c138a5111b33617faa 100644 GIT binary patch delta 31 mcmeC=?&RKZiG@*n@@1ARUOfgr27Lx`1_K5o2II+Ito8tezXtRG delta 31 mcmeC=?&RKZiG@*T@@1ARUVR2W1_K6h215oT29wENto8tf0tWd2 diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3$1.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3$1.class index a692bb9f4e28498225f3205ece708814b19afea4..0b10ce663d6c155646a9f49f9e125b48e29dc2f9 100644 GIT binary patch delta 23 ecmZqSZsFc=pM|k;@&lGc))oeNhSte$taboksRva6 delta 23 ecmZqSZsFc=pM|k$@&lGc)>a02hPKIWtabok#s^pc diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3.class index 379c1f79762ca9d2e34b7206a3a20fe2c6d410d9..ff0055a95dd0598340fe7e51ca0bc61491cb77ba 100644 GIT binary patch delta 81 zcmZ1^yGV9J9}i>Mh6)C2hQ7(-yt{QP8CV&r7`Pd#8KfBM7&IB` k8LSu@7@Qay8A2J_7-ASY7*ZKJfwEl;%?!Ph|MM;e07{`0f&c&j delta 81 zcmZ1^yGV9J9}i>s3$w6o#L3XX`SxPzKry9q2YQ?R2Is(3ZB)+OkMn?1F+=!j4c17D*u_Y!*#4 zL821BxJLw+;DSn-hEkCTsNoMkFfP$3iSdt(f872NOg#4%o8C$0p8I{@J@0$o_r2FT zMmo;LWJ)F>rU#f2B$qrP&-~@dGs~^`oDegE%pza#_U-N3BX~;7)}~`IJIEXg%v?!? zi-HuBBLsT4?d#m!zb%6Z(Eza^rIeY2vdmj9B+S>ju~{wMZ6$Lvh?5LbL8ahd)VI5D zUz0Fss;1v-{`54N6`riLIP-&4Q)4!Hx;+6Fm@6_bt(N*A4J=5MRHPbxCp~)mIqj54D0L*`8%v*7W;N-eIWZ+F`Kgg9mPnELbZS|!R`QgA*g}1& zk(?6K>YRfY zSu~_j9;syziWC|0$t28d{V6k*uaFj^v=U=GrLsUzw2t%RC#lmXWh(V7MBGY+Q`>Zn zr(_`>w>qtBUUzqqRzB^&P8zlHOOvi<;=RM{fRBxohRxMkO{>c_Ce`FoGYQR}K(i;% zY!|~pv)z6Un(bKUqS-jOK6h7fQ>*f`rN2&7R?lKR)TNuNXk;@@I#@G%b<9I7rE4H`-kq)o!aXY0>wbYfKhvm{EJQqD$&-XsldkzTgSejbr0*)Eq= z@f+-rALz4u?6gAcvI=cE2Cta4N3vygj z_N%qeYq0ifq)wPSg?9b8hU3(ncCm?e<0PHn#H3wTsQyv?MDABGzv^CLI*Y2ZUevBH zk=~qKvPisd8oE0KFp67B$UWGG9tMRKK&-lKgGKS z-_Yd0Ns_my;cbn=S(fmwx^#wiKA?m5G%WA)5Fe^XAF+WE4b8`F`)zWWRItH64+EOCmiZ zl1LHuUX)}CadZ?{#|$@Vwub64vpX88jO&hbHM{@tf*g=T%{K24Qj5|xSnef<<#9QR F{U3f+_WA$- delta 1351 zcmX|=TWnNS6o$WbW~S52)Lt0q9NN<9b=v8SEu}5(6lyOaT52gEg2h;w^mZGS^3om`~u2B>9g~k`cv#D{NGsvFFp0)R$z5ajw|Jt*C zSNhIHBr^kxV1T78GiM}L9138QFZg$j9NaK8I+95tMSh9{tf0jFDeI)vZ1Oauhba$G zL8Uq6sm#qHLbaco08wg%kh$RrnSO~DMu-QvojSq0XRLp};Hj?J?q{VCGv5?MaymEm zRIJRTo>c)FX)-&liS&9}10-lO|5_W(InVFXXrA+)kX94&RY+rUt#8t!Kfk3F@?UT9S$8|1E{drArR@ zJx=8(m)DFpA<_imBV9i*6rIB_%#fW(yTB4%6*#NqpA(*@Ea8vG=BTnbOCUZ+On4dZ zdE0-L;*Y5xh}Op9w%7K}(hv>OJVVR2H_40E#_crQ?;KoY&3Og!NVCpWWH1gzWKm3s zD&3&-DoSagj9wLYGu7;*Mpo;eH>cR~tF-7!c}gplh#Ms|vYd#gr45f8y{da&_jHX$ zKE>E7Yc)z!j4sDQt+E|*xef0k4Ssg$mlfG&rm#IDMvx{#G@HdjdsPa?c9T0WwwuU- zvE4)tjEw{6b59j8*;AAwdvvB!4RIwMI9Psqk5B zB2PtZ;U0zE!U68(Nw)GV_o;;gTxB~yazB6Z0M{9mB6dhEJC)3kBp8-mJS2}XB2TeP zF0)(a*&{!**YdH?3i5~*X4I zX0X&QNfnsm-g64fkskhV?aXm9n2FLRX*Tnvq3lEI&uKOCkoM3E=0>UAn!209bnZrO z-A$o89z|rm^s2B`+VXd6<}?+w(R7#9XHRIWyrj~dQ7&iA@v;Yfuds}-&9$=ftd!UV z4s)}#{Ig(qAUe%2GZKvDADfkegil|ISt#E(KB-+hMV!~PbzY}~_vz*h75gpq^OmanU zf5G>B<#x*B1T?Q-wwZ4$MsAY*!RZ^*Rk>JEI4~=*Bul&(C7wi_wh;7K9qtS-%3(RuVQV3drWx8F?vSJMgdE5I5C014%m4rY diff --git a/target/classes/net/t2code/lib/Spigot/system/Main.class b/target/classes/net/t2code/lib/Spigot/system/Main.class index 0f138f575dd5244ebce6485078e0e995bfa97780..0c7d405c0d083302fcc1db54d0a496be825c27b9 100644 GIT binary patch delta 289 zcmWO1ODjYH7=YpT`wnF`qUJ1Sn#D-&GBliA%0|XDmyBF9?&W$$ShxKI|g~6pELtJGQ<;MJ{abk5q=q! zT*jo3aamwOl1$2Th$(p`A{nODVn%IdHNl)-Gp{c!=^M+MVMX6r)lb&+hjsnKHe5sv zlTD+VEhEUb6Zd?1c5$&s3HwxWKn<~M>WDUuow#?W*q@CSkw+={l;NfvFBSNyM8pPE FqW?{TJPiN< delta 289 zcmWO1Nh^c_9DwoX|9>fS5jF2&Cd!hm*}c|W)Y!8$WX(Dbws)pbvP;pVl=m>D=0Z(5 zkvS-zKn^~Enj%SV@&UZ}=kWXzR>HdXn&Nj%vt4qNK{H|;RFg&xS=5q4JykT&gvAn# z?9BOOn7(HCkOPoG#=;xLJ?il8QL6QvdNRTH+_+XT8#`tAi z(wUHKCMCp_#F>`o05kH+tfZJzi+QzK&=`w)O-Nr@);Cr(#j3uurk||q54QdhHatWO zlMSPSO{0!2C+hq1?ciaTBK9bE=PNmMVMlau>_q+Bh50VDfDDSsqy#Ue_$edLZAENA GCHxO^