From 1fa34b5480946cd35b69451884510e3385dc8dcd Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Thu, 5 Jan 2023 17:57:09 -0800 Subject: [PATCH] Fixed pathetic oversight in EaglerXBungee skin DL ratelimits --- .../EaglerXBungee-Latest.jar | Bin 4266352 -> 4266360 bytes .../skins/SimpleRateLimiter.java | 3 +++ .../src/main/resources/plugin.yml | 2 +- gateway_version | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar index e3ef0a2bf4957ec7fc2e0ddd29487ee061205653..3195cbc976cd4a12da4e0447b9892de662dac321 100644 GIT binary patch delta 7154 zcmZWt2{@G78y|)-me0P8>`O@-(xy8zXH-g5v=Abx+ahhM+bY%VbK6OBx@jTp5~~+db@Xz>q^HmIaLZOfs zzSUt3!!k-Nqs%gVmQi6DRhAL3j2g=bSw@{@G+0KHWwclZ#I#vPhh=nGMvrCmS;l~6 z3|YpAWsF(Igk?-wM#M5^EYpQ$%vr{QWh`07ie;=>#)f5VS;mfK>{-TvWxBFVH^Uik?Dg2O&)qc*PEX_oC8kf*+Q_Jl2aJ$K*wdd$CPQ1r&&Nb3c? zu7w`jT9epy*CdBI?;n*e&R9JIOCF0Y(bp8d8<2@iKQU3qzIe&de;zTRrW*NvA>FPC&-9PT`8WY+!@m5B4Wf#2*f>KBMvqo4`_$jkxw2Xc8Z1M0oz1LN8+qU z$O!M-AvWP^lEoEjMBrAMcpBApIV85HDgj5u-KomS-H57m$J$SjKBtx;PNI_gGR4IL zVl#1(q|IiZ5@f=?J|i|J!JauMK1Bup$rB661J-tt3##C(5+uNdrO1$T$QOrGD|d$h z8Ky5$#WCebAD5OP1Md63;s3So*XeA2{v%S^BYV&2+n1l5O8#{2Tc58L6+fEm z2d(xJs*ci{<(;#9&HI11Y_wTa@JY4uh53c*n$r5)wabsj_})lP+WYFn=K z+CBAkBmb4<{D8>@=X#$^jP#y(Vy&i@NsZS_r|D~6Umh4YS~SDENBK~^_Lf%2g+uEH z%rc1_el_8?ak-+L_0>!4L=fNb8}b0 zP+_!I#Le>JNx|ufS5J5KQnP;(X7R{xdFXYAspkGJwtQi^cdv|I>zqeEc$A)zaywCD z<(Pq|#>xU*Vh0Yn{!hBSmc^f2?i+@yb)6>YCc4vnHgMkMev<+|^dHjbeJi6%a7a{g za}hSKcD*}p-{z*q4FNTSLXEE-?0V99dW>`Wv#t;R)j3u3_}mInWu*7fCG$5O_;@KK z`(|%0%Km}3%>@-4ufNbKAw@9L;qx)<7CWdSsL7q{wdvU0lBD608fiCWS3?hkhNR_B zJ8E&e=j^0+5oac(a7UQ#=QG1L*t9quaFXP^8jW#3cswEfMZH(-4HK1>2^p37+g4zf7jR~3g8q;L zF5j~&A5AFR&RFdXzTo}+LV@myI}>l0-}A^BlezZ3NLV>e;E6}YHl1YGWG5|tYccCz zXXfsfx1+Wgl>PU>QaJbeM{dTXy52!13Ebw81ySL}iD|A;HOac$ zD^t6;t+b9AbvmtJSh~lOA;Kc-(DK`deqBBHrcQk>x--xGS(U-0lD~}4=Ek*lGfgOUoYSZ`IKOF}Pru6G zZ}oir;+OT&=VQ*fwsdKUF48<~6E}QcmAK`AiaYmt4Wg~O8OnF=6_Fcp8HxI1}bZv=SzaK-*W2Wp@bz$#rsJ899_K~*BA?wBK7pQ*I z?XFr=5!!v>-u?A`$Q3c-QOYnq6&`Pt@RuvX?=ln{Qcy4y6aiQ3B(b3t2P$o@Dyd!V z6$jTX2VL7^Qn zM8eYA4uzRd4T47>&U&QenUJ_mJuWxTaDn3_z4Zw6(<8$@n+k_p5ERN0XnAj;}(FZjb-5vdXG?PvZ9>Vag4`6Rzp(OBUGQ&8hVu=x*6->02OzCe%1OhG)A5xa-ah_MDR%!%_R{EC$;ak>TFCb!s5G_?B0lU|K;EDx#r^LqZ@E8g!O^s4Zi`;U5q{E*{Ge&LV3*oLXC zfAlK!sMNH)>Y=*v;=R`Tl2(3<{)}xt-`CHskKOk+E+*Se-_|s}XrJYcMKwCpTsK_p zZ87i0(1_HV&Z3CFzU|x|Vb(l2ZHV4Xf%mPUj)F5@i=FR`-F1?QJv-cWNABIQMJrZl zz5H*1<1y!~u(Y)iMw^aczpuli=DR+yJz1RZ5W76SyTe$qee)dAwWy#GbNut4Jl+FV$6G)A zy*%fK`0F2*Iu_aczd9D%zS?hF5k8}Ng|LtBlDLVR8*&?&GmRD|cZ)u6?wd1t=Jol1 zXDMwjvRU-zrhbIm?>TGJ`);_~_s=P54>nqDzp{O6qtU4P3lf&mFd{p3hHP?^JW^J7!b(xkifT0o zQs;>#admd6kXo726NPXhN93tO)ZlG^YP(Q_3tB{lsLJ(z$d3rg4J>g-vpP751Zj0} zM?BC_Y7X?AI?VmygGP4<+4`YUD)eIl8cuRUsxUc4`nX72Cg6@uM8{}?NWtM!f=~n1 zrR4|StU2W{beTdl5dev>wVup~lm3nlQ~c+#)Z>OkpnL}sdg>+c5pOJ0!&dr`t{L%2 zhb{}m5R4D&%S^f21hjy-<>2W1kvhRafhwV?gq-?fUqhKIr*i;Jp)R1zcw^sqNI&3a zT-g!ykj@wCPzSDucNxjFIlD}BhFXS?0W-Q1;MEt8&VvFLd=5du181;5qG?35%t54P zxX?tV%hg{*a9hF*V1=lTHdkMOPE&|Zij*H*XbOJRub?A8m)4tWy@vQgK74U=Dn;n7 zvJgIA{mEw`F1?4GNj+u$L(9mxzHQ{+m%p#NkCqU;@jlu~#%&K!8X5aPL`h`4^AN2k zk{wd5rdvvG)^{K*mc?P&^sOm!QpLtSUjVFdmL5MYP06mZ7Z#|JF8c zek!+TTQ1i>Q%>!10TpN|RVaRjHWG!9O0q$|H?fVE54rt`RWH&GS&#r2XmgYU2jew0NJe@gTLQ)t@G_Ev&eo1LYk}dM@J6KG3D{@xbt`c3PS$To!sR`OZ3~_Ew2T4+mlEt z-7#s?Ftlkx{0*i+qS1H@w109t?T9zNl`}gDbKroSfdKOoKISLjwP$7iU zLvm5lz>&tznwZac2S&~w?ZiNrVS)S9$$g0HfZldoPD2wU#Cz(H15L=r8xIey;q!Qg zkd$BrM>lX~9f}~w$So%et_4F^`u0@?_`eSH!4e_d{^4%b7K<4~sno_K!B@MzBMl!lXuLG*Q zPK>Ra(QwlJ(qr$}2q25vL2YbeB%??6F);i~-qgs@_8!=YtiZA+plU{SP^Q!gjhv|s z(Ha8#Is-~kxWXiNV5?@dfC@QGeR|&vgvS40CT8NyW)w*-6pI#c!h}&L5Z^kf5&knw zD#FKFkQ4u2cn5Be2Y*E_e7EVHq5lY^7u6Y>{SBbX#hoGkcYwAp?+hh>M`HfPKRclQ z_*D(k#Zy|589#bM2i_Ccw4wog@sz1`FwYKCW-XfG*z_H22%x0OKows3Nh!-5sE0HD2dclrnXK=^y4G#mK7@bBDvDwgyypW2LPeu5b3Kwl9}KOn8V*yJ&ugwaFge}i%wu(# zArY@5U`S6nnAa1kc$h|;xCSsuE^Xo(G6N$1j({`!$-w|kIT)!4pozO2eAouo60lq> z2caic!;`e+h9k6q8Q~#k?rX_yydhwXryLx|$ibNmfW|&@@E(BHbPf8C(#(aUJ_ULc zKZPV-@|BDFX}5`<3S8`%3*|2b4*nDc(XSKaqR?O4QL6{~?K!p@M8zN)rXV_WV!NmS zLo2TPf1C5~xTo>QA)@mT(M$#1u{cFXwuEF(qziLNoJ>pw;cesvz)Uh;o<_iNq+_?C zyX44p$5|;35b@++&&UfLrY8#}n)!O5sT5Dv9$`y;dfc%@AHYQk#GE&2;q8g!Z2|@* z%E7aVaKSr1lpj$)17I?C%WXi@Zi9;qWY#nrtNKp%9S$>E4*Pt*!i+YgwaZJ0`FKMx zGWSS3XojKlH~Lv;a1SG(vre?r^aH?*`q-m^lXt1ZIWmH(tl;BOR=d0|9{NaL-v%0k zrBAtXhI}bt_)^fJN0XYHdvxNpx3GXa;C%hAV6NqSyHdCIQyydj=9XP-XUy~AVRTM?$fq+KSd97;Yg%!v4F0%l$#;)5}KVu)~%NTw_JeiuOy{{uG0 BKzjfH delta 7506 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 diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SimpleRateLimiter.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SimpleRateLimiter.java index fcc3d6a..4ff95ca 100644 --- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SimpleRateLimiter.java +++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/skins/SimpleRateLimiter.java @@ -30,6 +30,9 @@ public class SimpleRateLimiter { if(decr > 0) { timer += decr * t; count -= decr; + if(count < 0) { + count = 0; + } } if(count >= maxPerMinute) { return false; diff --git a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml index 7e5ca76..b227c21 100644 --- a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml +++ b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EaglercraftXBungee main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee -version: 1.0.2 +version: 1.0.3 description: Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks author: lax1dude \ No newline at end of file diff --git a/gateway_version b/gateway_version index e6d5cb8..e4c0d46 100644 --- a/gateway_version +++ b/gateway_version @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.3 \ No newline at end of file