diff --git a/pvptogglepluginworkspace/pom.xml b/pvptogglepluginworkspace/pom.xml
index 0614253..6db5674 100644
--- a/pvptogglepluginworkspace/pom.xml
+++ b/pvptogglepluginworkspace/pom.xml
@@ -6,7 +6,7 @@
benkralex
Pvptoggle
- 1.7.7-SNAPSHOT
+ 1.7.9-SNAPSHOT
jar
Pvptoggle
diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java
index 054b37d..ca3113c 100644
--- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java
+++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java
@@ -116,7 +116,7 @@ public class InventoryMenu {
ItemStack idefaultprot = new ItemStack(Material.GOLDEN_SWORD);
ItemMeta mdefaultprot = idefaultprot.getItemMeta();
mdefaultprot.setDisplayName("Standard PvP-Schutz an/aus schalten");
- lore.add(ChatColor.LIGHT_PURPLE + "Standart ist PvP-Schutz" + (Config.getPvpProt()?"an":"aus"));
+ lore.add(ChatColor.LIGHT_PURPLE + "Standart ist PvP-Schutz " + (Config.getPvpProt()?"an":"aus"));
lore.add(ChatColor.BLUE + "");
lore.add(ChatColor.DARK_PURPLE + (Config.getPvpProt()?"Aus":"An") + " schalten");
mdefaultprot.setLore(lore);
diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
index f780002..b23f6e1 100644
--- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
+++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
@@ -1,5 +1,6 @@
package benkralex.pvptoggle;
+import org.bukkit.ChatColor;
import org.bukkit.NamespacedKey;
import org.bukkit.entity.Player;
import org.bukkit.persistence.PersistentDataContainer;
@@ -14,24 +15,59 @@ 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);
+ boolean blacklisted;
+ boolean whitelisted;
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))
+ whitelisted = victimWithelist.has(new NamespacedKey(Pvptoggle.pvptoggle, damager.getUniqueId().toString()), PersistentDataType.STRING);
+ } else {
+ whitelisted = false;
}
-
-PersistentDataContainer victimBlacklist = victimPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "blacklist"), PersistentDataType.TAG_CONTAINER);
+ 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))
+ blacklisted = victimBlacklist.has(new NamespacedKey(Pvptoggle.pvptoggle, damager.getUniqueId().toString()), PersistentDataType.STRING);
+ } else {
+ blacklisted = false;
}
//return (!(toggle||ultravictim)||checkPvPData(damager,victim))&&!ultradamager;
- return checkPvPData(damager,victim) || (whitelisted && !ultradamager) || ((!toggle||!ultravictim) && ! blacklisted && !ultradamager)
+ //debug
+ victim.sendMessage(ChatColor.RED + "DEBUG:");
+ victim.sendMessage("Rückschlag: " + checkPvPData(damager,victim));
+ victim.sendMessage("Damager in Whitelist: " + whitelisted);
+ victim.sendMessage("Damager in Blacklist: " + blacklisted);
+ victim.sendMessage("PvP-Schutz (Toggle): " + toggle);
+ victim.sendMessage("PvP-Schutz (Ultra): " + ultravictim);
+ victim.sendMessage("Ultra bei Damager: " + ultradamager);
+ victim.sendMessage("Schutz: " + (!toggle||!ultravictim));
+ victim.sendMessage(" ");
+ victim.sendMessage("2.Oder: " + (whitelisted && !ultradamager));
+ victim.sendMessage("3.Oder: " + ((!toggle||!ultravictim) && !blacklisted && !ultradamager));
+
+ damager.sendMessage(ChatColor.RED + "DEBUG:");
+ damager.sendMessage("Rückschlag: " + checkPvPData(damager,victim));
+ damager.sendMessage("Damager in Whitelist: " + whitelisted);
+ damager.sendMessage("Damager in Blacklist: " + blacklisted);
+ damager.sendMessage("Victim PvP-Schutz (Toggle): " + toggle);
+ damager.sendMessage("Victim PvP-Schutz (Ultra): " + ultravictim);
+ damager.sendMessage("Ultra bei Damager: " + ultradamager);
+ damager.sendMessage("Victim Schutz: " + (!toggle||!ultravictim));
+ damager.sendMessage(" ");
+ damager.sendMessage("2.Oder: " + (whitelisted && !ultradamager));
+ damager.sendMessage("3.Oder: " + ((!toggle||!ultravictim) && !blacklisted && !ultradamager));
+
+ Pvptoggle.pvptoggle.getLogger().info("1.Oder: " + checkPvPData(damager,victim));
+ Pvptoggle.pvptoggle.getLogger().info("2.Oder: " + (whitelisted && !ultradamager));
+ Pvptoggle.pvptoggle.getLogger().info("3.Oder: " + (((!toggle||!ultravictim) && !blacklisted && !ultradamager)?"true":"false"));
+ //debug ende
+
+ return checkPvPData(damager,victim) || (whitelisted && !ultradamager) || ((!toggle||!ultravictim) && !blacklisted && !ultradamager);
}
public static boolean checkPvPData(Player damager, Player victim){
String victimUUID=victim.getUniqueId().toString();
- PersistentDataContainer damagerPDC=damager.getPersistentDataContainer();
- PersistentDataContainer damagersOfDamager=damagerPDC.get(new NamespacedKey(Pvptoggle.pvptoggle,"pvpdamagers"), PersistentDataType.TAG_CONTAINER);
- if (damagersOfDamager!=null) {
+ PersistentDataContainer damagerPDC = damager.getPersistentDataContainer();
+ PersistentDataContainer damagersOfDamager = damagerPDC.get(new NamespacedKey(Pvptoggle.pvptoggle,"pvpdamagers"), PersistentDataType.TAG_CONTAINER);
+ if (damagersOfDamager != null) {
delOldData(damagersOfDamager);
return damagersOfDamager.has(new NamespacedKey(Pvptoggle.pvptoggle, victimUUID), PersistentDataType.LONG);
} else {
diff --git a/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar b/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar
deleted file mode 100644
index a6da66e..0000000
Binary files a/pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar and /dev/null differ
diff --git a/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar b/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar
deleted file mode 100644
index 9a18d9d..0000000
Binary files a/pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar and /dev/null differ