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/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>benkralex</groupId> <groupId>benkralex</groupId>
<artifactId>Pvptoggle</artifactId> <artifactId>Pvptoggle</artifactId>
<version>1.6-FINAL</version> <version>1.7.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Pvptoggle</name> <name>Pvptoggle</name>
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java
+2 -2
View File
@@ -38,7 +38,7 @@ public class InventoryMenu {
ItemMeta mtoggle = itoggle.getItemMeta(); ItemMeta mtoggle = itoggle.getItemMeta();
mtoggle.setDisplayName("PvP-Schutz an/aus schalten"); mtoggle.setDisplayName("PvP-Schutz an/aus schalten");
mtoggle.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); 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"); lore.add(ChatColor.BLUE + s + " schalten");
mtoggle.setLore(lore); mtoggle.setLore(lore);
itoggle.setItemMeta(mtoggle); itoggle.setItemMeta(mtoggle);
@@ -48,7 +48,7 @@ public class InventoryMenu {
ItemMeta multra = iultra.getItemMeta(); ItemMeta multra = iultra.getItemMeta();
multra.setDisplayName("Ultra an/aus schalten"); multra.setDisplayName("Ultra an/aus schalten");
multra.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); 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); multra.setLore(lore);
iultra.setItemMeta(multra); iultra.setItemMeta(multra);
return iultra; return iultra;
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java
+4 -1
View File
@@ -171,12 +171,15 @@ public class PvpCommand {
if (action == 0) { if (action == 0) {
//Kampf herrausgefordert //Kampf herrausgefordert
Player pargs = (Player) args.get("Player"); Player pargs = (Player) args.get("Player");
TextComponent tc1 = new TextComponent("" + ChatColor.WHITE + " | ");
TextComponent accept = new TextComponent(ChatColor.GREEN + "Annehmen"); TextComponent accept = new TextComponent(ChatColor.GREEN + "Annehmen");
TextComponent deny = new TextComponent(ChatColor.RED + "Ablehnen"); TextComponent deny = new TextComponent(ChatColor.RED + "Ablehnen");
accept.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/pvp fight accept")); accept.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/pvp fight accept"));
deny.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/pvp fight deny")); deny.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/pvp fight deny"));
pargs.sendMessage("Du wurdest von " + sender.getDisplayName() + " zu einem Kampf herrausgefordert."); 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"); sender.sendMessage("Der Command funktioniert noch nicht");
} else if (action == 1) { } else if (action == 1) {
//Kampf angenommen //Kampf angenommen
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
+4 -14
View File
@@ -11,21 +11,11 @@ public class Util {
public static boolean canPvP(Player damager, Player victim){ public static boolean canPvP(Player damager, Player victim){
PersistentDataContainer damagerPDC=damager.getPersistentDataContainer(); PersistentDataContainer damagerPDC=damager.getPersistentDataContainer();
PersistentDataContainer victimPDC=victim.getPersistentDataContainer(); PersistentDataContainer victimPDC=victim.getPersistentDataContainer();
Boolean ultradamager; boolean ultradamager = damagerPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN, false);
Boolean ultravictim; boolean ultravictim = victimPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"),PersistentDataType.BOOLEAN, false);
Boolean toggle = damagerPDC.get(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"),PersistentDataType.BOOLEAN); boolean toggle = damagerPDC.getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"),PersistentDataType.BOOLEAN, false);
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;
return !toggle || checkPvPData(damager, victim) || !ultradamager || !ultravictim;
} else {
return true;
}
} }
public static boolean checkPvPData(Player damager, Player victim){ public static boolean checkPvPData(Player damager, Player victim){
String victimUUID=victim.getUniqueId().toString(); String victimUUID=victim.getUniqueId().toString();
pvptogglepluginworkspace/target/Pvptoggle-1.7.1-SNAPSHOT.jar
BIN
View File
Binary file not shown.
pvptogglepluginworkspace/target/original-Pvptoggle-1.7.1-SNAPSHOT.jar
BIN
View File
Binary file not shown.