From 7d332bec9b27f456a9cbe05be2dfacf82a0ad716 Mon Sep 17 00:00:00 2001 From: skippyall <121978267+skippyall@users.noreply.github.com> Date: Sun, 27 Aug 2023 17:24:00 +0200 Subject: [PATCH] fix --- .../main/java/benkralex/pvptoggle/Util.java | 2 +- .../target/Pvptoggle-1.7.1-SNAPSHOT.jar | Bin 19881 -> 19885 bytes .../original-Pvptoggle-1.7.1-SNAPSHOT.jar | Bin 19589 -> 19593 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java index 9e6d3fa..fc8b34f 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java @@ -15,7 +15,7 @@ public class Util { boolean ultravictim = victimPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN, false); boolean toggle = damagerPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"),PersistentDataType.BOOLEAN, false); - return !((toggle||ultravictim)||checkPvPData(damager,victim))&&!ultradamager; + return (!(toggle||ultravictim)||checkPvPData(damager,victim))&&!ultradamager; } public static boolean checkPvPData(Player damager, Player victim){ String victimUUID=victim.getUniqueId().toString(); diff --git a/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar b/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar index c25e8a997b0e8b8e028fd3e9c4db816d6b0a13f9..a6da66e786439dd9c64e948c889cf424bbe2e5d1 100644 GIT binary patch delta 1964 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 diff --git a/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar b/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar index 22ab57eb37b36ddb95a5e25d447897e0cf6d7bf1..9a18d9dc34de0687a3afe3d050ee9e1896082651 100644 GIT binary patch delta 2051 zcmZ9Ndpr~T9>-@G)<`qjo`!PSJT%uW9G53sY_{BQBMx)RHJ7m0asep2 z%{=07Rj z<3ru~C=^HQ{IiQ)4qqoMAK%%DRJ~*IMI4`MU;N7q{TZ)`x3v}W;T`H^5;YVvG*>xPBHuk3r0Iz((Yn+gieAIHVYopp8>q7RH=P7+N?wVR2j_a&xfjBUlxG50r$Qu$xA$Lb7&Zok>1ubH}064>ZvegE_ZVPgh-^n$SQ>N z8yR$+sz2m5ITS$q5D)Gd<5tFXcxHE0S8`sI5@etNKp>!*TRZK?$(udc9lTBKrr}E zgubv4uGtI*?@0~dQ>T6I>E;ft~QtSHJzl}3+sKF+iLG7f2jK- zop*QcZPY*Xs0&Xf#q?Hkm;6nl&*piRRDj}Q_a^#Z!d=xf25T=(w~jTqON2W}nsiHQ z3?1J1ph()GZ`EEdf#}HO7MW!Sp1k+|O%lAAG4ZfYqf|WBx60bPIBcQ<(QAb$jy2C6 z_<72+{uC#;Ii^2P&|kx`nB}}jOI@rRl#b2LPN2NzI0CXq+f+N>&KKNpuU->#M`)|Ps1C~go7s^uEk82T57vd(cSdQ)rR#N2LbTv2xr7 zPjU7F)FV8uB(~=T@%CqSy%lbuMWTPrbEzP=oWz69KK>Bb6bK2|;4mc}+?|{)9{Z9e zuU{*xn35z5^}Ni7EE{r2f!D&QJM)pPkZlU)CvNpmHZ>{unsT7hr`{pp!G!1Ap;y*X70Fiw2WrMw^@4L z>WD*INRBU7A(Vj{vX~4s=f0mDd0ti}+(=UY$gqEIQ}w=#Vi z1%?j@$|Y){$k;pxQgV6Y*pt0#TxJ3p&JVjC@{^&(2n{Awnb8aihBYIfRwX@UN-;i*aBnwrLQ zP3BHIT%$wN?V#T7Luc?%vb#>Ob-|gx2 zRSfh_H4Rv!tCRI@Z3N5dJ=4@aU{l+YNM3o`Mm?iz=kI&J{KO5T$bY&d4dzlh{MvA| zOVIN{S_189f8095$zII0md!U0_$EaI>C5)$$j)cDr{#{zq!`Qx2<%q7gz0+Cnw9zo z9-XUo5nNWn18ovBvF!)S!AE*}B$|q8U@3T-#HPIZZsByT&J+$7H#1!s!x849qXVH| zBv`gcv+GqB2Z?s`u$sT;78tkr)_~lCK@a5IG*(dHW=1tRLh8h?e#2TXv?KV|X_3qq z1xnz;W0dolIZ>3n8Z0%a4aS#f{5EqYceFTYC|ZWQYH=VG{Wl;Qnv- z$w=go6#x(&5q~!HoNjVtgd;@^2owKH!R(J@q*xbQj-n!ZMwfyFF5%e*1fk9Yt0eeUm`d(S=h{`1W)1!k54!ER2{ zyZ!-?jFPM?U>&LAtShEHlKR!?M{Uss21rZH-nAwpF+tWtPU0iAKt+jqCcz+ymo3ty zAjMg#olg$lOwod&eXOg-5W~*G}fq!+q-Y1?Eq(1wyEVuWKC3@RyIDDsk zd+Z6Xv!x91ic-@?9C{nFICOn$`dyjzNAc$yX}~766SJe|v(%|WI- zTaZJzXMk`ssaJ2q48Z10T9f=YWC3Lfx$CqqG>;i@aekQ}cF${igcVDUwu6!9z}}RJ zW$!r|1Ih@28H{}6KJ8`}05-S0He=~|3U9K%6nPkH!DaFNv|5pyeA(HjNzoCnhw!^`RFmL`O4d0|4k2~y z?uCA=Jdttqx-hp`Y+WWgrgeLTBA_(^5`!985&7|aO3V!8-`nf^?U90S-)Dw=4&c5w zggTRG;%1;~=+qyvD(1%Aq26)jJO?lP!+j_nw%7L_uu{IpO?u+R%=_|fG5s-dN0(Vln&J&S;poj%;x`ApGWp3td`faF3Y;0}%p}U5@r!RCO0^Yk(k%kOu0h4bZ9*+H)se%T7DS)rz zu|6IG%OXF8di285vQmL|;|l@#;Pc^8W*XL{N_#)OoeE`Zyhx9Ec=v0bu7 z=4$RX^$MEzEwCQVX>n&63knFE!F909NV6ijuL=d{cggh33hP8P#PHnibjx4Lxn-N17|Nb7c9RK+lWL5cfhpyvBIHNE>m1e0lUt0JL z+_#pL;lYuA1mAp-vvx51H#EG;zwy0CRM)((ZQh0+FgB$qnTOFa;XgdOeta4Q(}Mp| z8!^i9=6e0SuHtpBj$gfS?jq!ild|g_*KiD^ln*aTjmBH!=HhZe;nQ&;E=%;q=3`KR zY85*?Ayj!_U<#763D&Wga3_kIl2!tW{X!g$)rFPpOI3}bRN?5O8kk@IW)Z^x^@wKtU?*3 zdei74jhh>MO~@R-GdhL)y7vH1Q_jG`wZZ>`XPzs+km))&5l4M#76SXW*jSXta(}z5 z>~`?B?h1Fu#gw*UFxHkqfxK1Mqj!~dv|eoz-)!!4D2PlX7LGOgl2Oi-z#6W3gwfga zPm)F$xis5GQ%oT=nXZHsMU0>N3GPk=dR3}MI=>V*0KzV8R9_U2<`2KO1RkmJdwfZz zLtS-!cbhge#Q0hKxq+`^5AecehXPPSIfTL!Fkga=NOORUVq5j#`L0sric`s&evIgd+6ee7wyW_Cb$_rMvgb5UmOl|su zhVC$b;nUiO=rg<+3S)q>wa>rz)ph!qFR-gyuoARGXens2(?d4(mlVF!)c429*l*MW z64{tf)p-KnsE~>dlf0+ek2kzfrPD1<=3^oV*B&PO$Rc23MVtkCUAy)U!}htHkEG-D;*%uU5^N=;6G#$92xJK;qNjv3qT8Q~L>CDM9bJF= zTQYLaJ06$%aa*S&!b*ez0AixzPlra!Rq~&?{NEz?zeXOgv(t>_ zjAEgv|Gypfx9u|=S0|+85y?&nDJ2}omZZb!aMG3XkxWq>1(E?!z&TE`1Eu06=l%ny Cd7wN1