From 0348dd3b78c1436bfbbe7ec8aaf6bef40098c319 Mon Sep 17 00:00:00 2001
From: Benkralex <75564514+Benkralex@users.noreply.github.com>
Date: Sun, 27 Aug 2023 21:13:36 +0200
Subject: [PATCH] Now White- and Blacklist should work

---
 .../src/main/java/benkralex/pvptoggle/Util.java      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
index fc8b34f..b627934 100644
--- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
+++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
@@ -14,8 +14,18 @@ public class Util {
         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);
+        PersistentDataContainer victimWithelist = victimPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "whitelist"), PersistentDataType.TAG_CONTAINER);
+        if (victimWithelist != null) {
+            boolean whitelisted = victimWithelist.has(new NamespacedKey(Pvptoggle.pvptoggle, damager.getUniqueId().toString(), PersistentDataType.STRING))
+        }
 
-        return (!(toggle||ultravictim)||checkPvPData(damager,victim))&&!ultradamager;
+PersistentDataContainer victimBlacklist = victimPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "blacklist"), PersistentDataType.TAG_CONTAINER);
+        if (victimBlacklist != null) {
+            boolean blacklisted = victimBlacklist.has(new NamespacedKey(Pvptoggle.pvptoggle, damager.getUniqueId().toString(), PersistentDataType.STRING))
+        }
+
+        //return (!(toggle||ultravictim)||checkPvPData(damager,victim))&&!ultradamager;
+        return checkPvPData(damager,victim) || whitelisted || (((!toggle||!ultravictim) && ! blacklisted && !ultradamager)
     }
     public static boolean checkPvPData(Player damager, Player victim){
         String victimUUID=victim.getUniqueId().toString();