add debug
+fix one space at the lore of defaultprot +updated target
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>benkralex</groupId>
|
||||
<artifactId>Pvptoggle</artifactId>
|
||||
<version>1.7.7-SNAPSHOT</version>
|
||||
<version>1.7.9-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Pvptoggle</name>
|
||||
|
||||
@@ -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,18 +15,53 @@ 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);
|
||||
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();
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user