This commit is contained in:
Benkralex
2023-08-27 15:41:21 +02:00
parent 382e57d6b6
commit 797297fe4a
3 changed files with 6 additions and 11 deletions
@@ -100,15 +100,12 @@ public class InventoryListener implements Listener{
String iname = e.getCurrentItem().getItemMeta().getDisplayName(); String iname = e.getCurrentItem().getItemMeta().getDisplayName();
if (iname.equals("Inventar schließen")) { if (iname.equals("Inventar schließen")) {
p.closeInventory(); p.closeInventory();
return;
} else if (iname.equals("Zurück")) { } else if (iname.equals("Zurück")) {
p.closeInventory(); p.closeInventory();
p.openInventory(InventoryMenu.pvpMenu(p)); p.openInventory(InventoryMenu.pvpMenu(p));
return;
} else if (iname.equals("Standard PvP-Schutz an/aus schalten")){ } else if (iname.equals("Standard PvP-Schutz an/aus schalten")){
Config.setPvpProt(!Config.getPvpProt()); Config.setPvpProt(!Config.getPvpProt());
inv.setItem(11, InventoryMenu.getMenuItem(8, p)); inv.setItem(11, InventoryMenu.getMenuItem(8, p));
return;
} else if (iname.equals("Zeit um zurückzuschlagen erhöhen")) { } else if (iname.equals("Zeit um zurückzuschlagen erhöhen")) {
if (e.isRightClick()) { if (e.isRightClick()) {
Config.setPvpTime(Config.getPvpTime() + 1); Config.setPvpTime(Config.getPvpTime() + 1);
@@ -116,18 +113,16 @@ public class InventoryListener implements Listener{
Config.setPvpTime(Config.getPvpTime() + 10); Config.setPvpTime(Config.getPvpTime() + 10);
} }
inv.setItem(15, InventoryMenu.getMenuItem(9, p)); inv.setItem(15, InventoryMenu.getMenuItem(9, p));
return;
} else if (iname.equals("Zeit um zurückzuschlagen verringern")) { } else if (iname.equals("Zeit um zurückzuschlagen verringern")) {
if (e.isRightClick()) { if (e.isRightClick()) {
Config.setPvpTime(Config.getPvpTime() - 1); Config.setPvpTime(Config.getPvpTime() - 1);
} else if (e.isLeftClick()) { } else if (e.isLeftClick()) {
Config.setPvpTime(Config.getPvpTime() - 10); 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)); inv.setItem(15, InventoryMenu.getMenuItem(9, p));
return;
} else {
return;
} }
} }
} }
@@ -138,7 +138,7 @@ public class PvpCommand {
int i = 0; int i = 0;
for (NamespacedKey uuid:pdcList.getKeys()) { for (NamespacedKey uuid:pdcList.getKeys()) {
i++; 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 { } else {
sender.sendMessage("Deine "+listName+ "ist leer"); sender.sendMessage("Deine "+listName+ "ist leer");
@@ -146,7 +146,7 @@ public class PvpCommand {
} else if (action == 2) { } else if (action == 2) {
//hinzufügen //hinzufügen
if (pdcList.has(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER)) { 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{ }else{
pdcList.set(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER,pdcList.getAdapterContext().newPersistentDataContainer()); 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"); sender.sendMessage(ChatColor.GREEN + ((Player)args.get("Player")).getDisplayName() + "wurde zu deiner "+listName+" hinzugefügt");
@@ -18,7 +18,7 @@ public final class Pvptoggle extends JavaPlugin {
public void onLoad(){ public void onLoad(){
pvptoggle = this; pvptoggle = this;
PvpCommand.createPvpCommand(); PvpCommand.createPvpCommand();
if (Config.getPvpTime() <= 0) { if (Config.getPvpTime() < 0) {
Config.setPvpTime(0); Config.setPvpTime(0);
} }
} }