From 158efb75d9add8f3a4e519a2cb5a09864cebd423 Mon Sep 17 00:00:00 2001 From: Benkralex Date: Sun, 27 Aug 2023 17:29:33 +0200 Subject: [PATCH] commit --- pvptogglepluginworkspace/pom.xml | 2 +- .../java/benkralex/pvptoggle/InventoryListener.java | 11 ++++++----- .../src/main/java/benkralex/pvptoggle/Pvptoggle.java | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pvptogglepluginworkspace/pom.xml b/pvptogglepluginworkspace/pom.xml index fd54697..7bca1c3 100644 --- a/pvptogglepluginworkspace/pom.xml +++ b/pvptogglepluginworkspace/pom.xml @@ -6,7 +6,7 @@ benkralex Pvptoggle - 1.7.1-SNAPSHOT + 1.7.3-SNAPSHOT jar Pvptoggle diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java index 676f2ee..3990a59 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java @@ -115,12 +115,13 @@ public class InventoryListener implements Listener{ inv.setItem(15, InventoryMenu.getMenuItem(9, p)); } else if (iname.equals("Zeit um zurückzuschlagen verringern")) { if (e.isRightClick()) { - Config.setPvpTime(Config.getPvpTime() - 1); + if (!(Config.getPvpTime() < 1)) { + Config.setPvpTime(Config.getPvpTime() - 1); + } } else if (e.isLeftClick()) { - Config.setPvpTime(Config.getPvpTime() - 10); - } - if (Config.getPvpTime() < 0) { - Config.setPvpTime(0); + if (!(Config.getPvpTime() < 10)) { + Config.setPvpTime(Config.getPvpTime() - 10); + } } inv.setItem(15, InventoryMenu.getMenuItem(9, p)); } diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Pvptoggle.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Pvptoggle.java index 4429604..e6c7e95 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Pvptoggle.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Pvptoggle.java @@ -12,14 +12,14 @@ public final class Pvptoggle extends JavaPlugin { Bukkit.getPluginManager().registerEvents(new PvpEvent(), this); Bukkit.getPluginManager().registerEvents(new InventoryListener(), this); Config.createConfig(); + if (Config.getPvpTime() < 0) { + Config.setPvpTime(0); + } } @Override public void onLoad(){ pvptoggle = this; - PvpCommand.createPvpCommand(); - if (Config.getPvpTime() < 0) { - Config.setPvpTime(0); - } + PvpCommand.createPvpCommand(); } } \ No newline at end of file