commit

Felitendo · Apr 1, 2024 · 7d5e770 · 7d5e770
1 parent ba31d2a
commit 7d5e770
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 28 deletions.
diff --git a/core/src/main/java/de/felitendo/felotools/core/commands/PvP.java b/core/src/main/java/de/felitendo/felotools/core/commands/PvP.java
@@ -24,14 +24,13 @@ public PvP(FeloToolsAddon addon) {
   public boolean execute(String prefix, String[] arguments) {
     if (prefix.equalsIgnoreCase("ftpvp")) {
       {
-        if (arguments.length == 0) {
+        if (arguments.length == 2) {
           sendMessage();
         }
-
       }
-      return true;
+      return false;
     }
-    return false;
+    return true;
   }
 
   public void sendMessage() {

diff --git a/core/src/main/java/de/felitendo/felotools/core/commands/subcommands/PvP_new.java b/core/src/main/java/de/felitendo/felotools/core/commands/subcommands/PvP_new.java
@@ -14,29 +14,26 @@ public class PvP_new extends SubCommand {
 
   @Override
   public boolean execute(String prefix, String[] arguments) {
-    if (arguments.length == 2) {
-      labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldBlockBuild().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldBow().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldCreativeLayout().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldDamageColor().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldFishingRod().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldFood().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldHeadRotation().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldHeart().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldHitbox().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldItemPosture().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldRange().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldSlowdown().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldSneaking().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldSurvivalLayout().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
-      labyAPI().config().multiplayer().classicPvP().oldSword().set(false);
-      labyAPI().config().multiplayer().classicPvP().potionFix().set(false);
-      labyAPI().config().multiplayer().classicPvP().shouldRemoveRecipeBook().set(false);
-      sendMessage();
-      return false;
-    }
+    sendMessage();
+    labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldBlockBuild().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldBow().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldCreativeLayout().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldDamageColor().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldFishingRod().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldFood().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldHeadRotation().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldHeart().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldHitbox().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldItemPosture().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldRange().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldSlowdown().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldSneaking().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldSurvivalLayout().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
+    labyAPI().config().multiplayer().classicPvP().oldSword().set(false);
+    labyAPI().config().multiplayer().classicPvP().potionFix().set(false);
+    labyAPI().config().multiplayer().classicPvP().shouldRemoveRecipeBook().set(false);
     return true;
   }
 

diff --git a/core/src/main/java/de/felitendo/felotools/core/commands/subcommands/PvP_old.java b/core/src/main/java/de/felitendo/felotools/core/commands/subcommands/PvP_old.java
@@ -34,7 +34,7 @@ public boolean execute(String prefix, String[] arguments) {
     labyAPI().config().multiplayer().classicPvP().oldSword().set(true);
     labyAPI().config().multiplayer().classicPvP().potionFix().set(true);
     labyAPI().config().multiplayer().classicPvP().shouldRemoveRecipeBook().set(true);
-    return false;
+    return true;
   }
 
   public void sendMessage() {