Mineattack/PvpTogglePlugin
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Benkralex
2023-08-27 15:33:55 +02:00
parent 568c11bd89
commit 382e57d6b6
6 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
+5 -15
View File
@@ -11,21 +11,11 @@ public class Util {
public static boolean canPvP(Player damager, Player victim){
PersistentDataContainer damagerPDC=damager.getPersistentDataContainer();
PersistentDataContainer victimPDC=victim.getPersistentDataContainer();
Boolean ultradamager;
Boolean ultravictim;
Boolean toggle = damagerPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"),PersistentDataType.BOOLEAN);
if (victimPDC.has(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN)) {
ultravictim = victimPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN);
} else {ultravictim = false;}
if (damagerPDC.has(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN)) {
ultradamager = damagerPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN);
} else {ultradamager = false;}
if(toggle!=null) {
return !toggle || checkPvPData(damager, victim) || !ultradamager || !ultravictim;
} else {
return true;
}
boolean ultradamager = damagerPDC.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);
return !toggle || checkPvPData(damager, victim) || !ultradamager || !ultravictim;
}
public static boolean checkPvPData(Player damager, Player victim){
String victimUUID=victim.getUniqueId().toString();