Mineattack/PvpTogglePlugin
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Benkralex/PvpTogglePlugin

Browse Source
This commit is contained in:
skippyall
2023-08-27 17:27:59 +02:00
parent 7d332bec9b 112686e0bc
commit 6d966c0ad3
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java
+3 -8
View File
@@ -100,15 +100,12 @@ public class InventoryListener implements Listener{
String iname = e.getCurrentItem().getItemMeta().getDisplayName();
if (iname.equals("Inventar schließen")) {
p.closeInventory();
return;
} else if (iname.equals("Zurück")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpMenu(p));
return;
} else if (iname.equals("Standard PvP-Schutz an/aus schalten")){
Config.setPvpProt(!Config.getPvpProt());
inv.setItem(11, InventoryMenu.getMenuItem(8, p));
return;
} else if (iname.equals("Zeit um zurückzuschlagen erhöhen")) {
if (e.isRightClick()) {
Config.setPvpTime(Config.getPvpTime() + 1);
@@ -116,18 +113,16 @@ public class InventoryListener implements Listener{
Config.setPvpTime(Config.getPvpTime() + 10);
}
inv.setItem(15, InventoryMenu.getMenuItem(9, p));
return;
} else if (iname.equals("Zeit um zurückzuschlagen verringern")) {
if (e.isRightClick()) {
Config.setPvpTime(Config.getPvpTime() - 1);
} else if (e.isLeftClick()) {
Config.setPvpTime(Config.getPvpTime() - 10);
}
if (Config.getPvpTime() <= 0) Config.setPvpTime(0);
if (Config.getPvpTime() < 0) {
Config.setPvpTime(0);
}
inv.setItem(15, InventoryMenu.getMenuItem(9, p));
return;
} else {
return;
}
}
}
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java
+2 -2
View File
@@ -138,7 +138,7 @@ public class PvpCommand {
int i = 0;
for (NamespacedKey uuid:pdcList.getKeys()) {
i++;
sender.sendMessage(""+ChatColor.DARK_BLUE + i + ". " + ChatColor.BLUE +Bukkit.getPlayer(UUID.fromString(uuid.getKey())).getName());
sender.sendMessage("" + ChatColor.DARK_BLUE + i + ". " + ChatColor.BLUE + Bukkit.getPlayer(UUID.fromString(uuid.getKey())).getName());
}
} else {
sender.sendMessage("Deine "+listName+ "ist leer");
@@ -146,7 +146,7 @@ public class PvpCommand {
} else if (action == 2) {
//hinzufügen
if (pdcList.has(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER)) {
sender.sendMessage(ChatColor.RED + "Der Spieler" + args.get("Player") + "ist schon in deiner "+listName);
sender.sendMessage(ChatColor.RED + "Der Spieler" + args.get("Player") + "ist schon in deiner " + listName);
}else{
pdcList.set(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER,pdcList.getAdapterContext().newPersistentDataContainer());
sender.sendMessage(ChatColor.GREEN + ((Player)args.get("Player")).getDisplayName() + "wurde zu deiner "+listName+" hinzugefügt");
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Pvptoggle.java
+1 -1
View File
@@ -18,7 +18,7 @@ public final class Pvptoggle extends JavaPlugin {
public void onLoad(){
pvptoggle = this;
PvpCommand.createPvpCommand();
if (Config.getPvpTime() <= 0) {
if (Config.getPvpTime() < 0) {
Config.setPvpTime(0);
}
}