Merge branch 'main' of https://github.com/Benkralex/PvpTogglePlugin
This commit is contained in:
@@ -15,7 +15,7 @@ public class Util {
|
|||||||
boolean ultravictim = victimPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN, false);
|
boolean ultravictim = victimPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN, false);
|
||||||
boolean toggle = damagerPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"),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){
|
public static boolean checkPvPData(Player damager, Player victim){
|
||||||
String victimUUID=victim.getUniqueId().toString();
|
String victimUUID=victim.getUniqueId().toString();
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user