Update
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>benkralex</groupId>
|
||||
<artifactId>Pvptoggle</artifactId>
|
||||
<version>1.6-FINAL</version>
|
||||
<version>1.7.1-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Pvptoggle</name>
|
||||
|
||||
@@ -38,7 +38,7 @@ public class InventoryMenu {
|
||||
ItemMeta mtoggle = itoggle.getItemMeta();
|
||||
mtoggle.setDisplayName("PvP-Schutz an/aus schalten");
|
||||
mtoggle.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
|
||||
String s = p.getPersistentDataContainer().get(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN)?"Aus":"An";
|
||||
String s = p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN, false)?"Aus":"An";
|
||||
lore.add(ChatColor.BLUE + s + " schalten");
|
||||
mtoggle.setLore(lore);
|
||||
itoggle.setItemMeta(mtoggle);
|
||||
@@ -48,7 +48,7 @@ public class InventoryMenu {
|
||||
ItemMeta multra = iultra.getItemMeta();
|
||||
multra.setDisplayName("Ultra an/aus schalten");
|
||||
multra.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
|
||||
lore.add(ChatColor.BLUE + (p.getPersistentDataContainer().get(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"), PersistentDataType.BOOLEAN)?"Aus":"An") + " schalten");
|
||||
lore.add(ChatColor.BLUE + (p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"), PersistentDataType.BOOLEAN, false)?"Aus":"An") + " schalten");
|
||||
multra.setLore(lore);
|
||||
iultra.setItemMeta(multra);
|
||||
return iultra;
|
||||
|
||||
@@ -171,12 +171,15 @@ public class PvpCommand {
|
||||
if (action == 0) {
|
||||
//Kampf herrausgefordert
|
||||
Player pargs = (Player) args.get("Player");
|
||||
TextComponent tc1 = new TextComponent("" + ChatColor.WHITE + " | ");
|
||||
TextComponent accept = new TextComponent(ChatColor.GREEN + "Annehmen");
|
||||
TextComponent deny = new TextComponent(ChatColor.RED + "Ablehnen");
|
||||
accept.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/pvp fight accept"));
|
||||
deny.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/pvp fight deny"));
|
||||
pargs.sendMessage("Du wurdest von " + sender.getDisplayName() + " zu einem Kampf herrausgefordert.");
|
||||
pargs.sendMessage(accept + "" + ChatColor.WHITE + " | " + deny);
|
||||
accept.addExtra(tc1);
|
||||
accept.addExtra(deny);
|
||||
pargs.spigot().sendMessage(accept);
|
||||
sender.sendMessage("Der Command funktioniert noch nicht");
|
||||
} else if (action == 1) {
|
||||
//Kampf angenommen
|
||||
|
||||
@@ -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;}
|
||||
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);
|
||||
|
||||
if(toggle!=null) {
|
||||
return !toggle || checkPvPData(damager, victim) || !ultradamager || !ultravictim;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
return !toggle || checkPvPData(damager, victim) || !ultradamager || !ultravictim;
|
||||
}
|
||||
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