diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java index ffe45a1..9e6d3fa 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 || checkPvPData(damager, victim) || !ultradamager || !ultravictim; + 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 a8fc7d3..c25e8a9 100644 Binary files a/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar and b/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar differ diff --git a/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar b/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar index 332f99c..22ab57e 100644 Binary files a/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar and b/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar differ