From 11539d82901a62cd80e13fd4c50b3b37e99ba767 Mon Sep 17 00:00:00 2001
From: NEZNAMY <n.e.z.n.a.m.y@azet.sk>
Date: Mon, 4 Jul 2022 13:44:08 +0200
Subject: [PATCH] Commands - Allow removing per-world/server values

---
 .../main/java/me/neznamy/tab/shared/command/GroupCommand.java | 4 ++--
 .../java/me/neznamy/tab/shared/command/PlayerCommand.java     | 4 ++--
 .../java/me/neznamy/tab/shared/command/PlayerUUIDCommand.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared/src/main/java/me/neznamy/tab/shared/command/GroupCommand.java b/shared/src/main/java/me/neznamy/tab/shared/command/GroupCommand.java
index 3e4fcdcb5..7772df414 100644
--- a/shared/src/main/java/me/neznamy/tab/shared/command/GroupCommand.java
+++ b/shared/src/main/java/me/neznamy/tab/shared/command/GroupCommand.java
@@ -41,11 +41,11 @@ public class GroupCommand extends PropertyCommand {
         String server = null;
         if (args[args.length-2].equals("-w")) {
             world = args[args.length-1];
-            value = value.substring(0, value.length()-world.length()-4);
+            value = value.startsWith("-w") ? "" : value.substring(0, value.length()-world.length()-4);
         }
         if (args[args.length-2].equals("-s")) {
             server = args[args.length-1];
-            value = value.substring(0, value.length()-server.length()-4);
+            value = value.startsWith("-s") ? "" : value.substring(0, value.length()-server.length()-4);
         }
         if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
             value = value.substring(1, value.length()-1);
diff --git a/shared/src/main/java/me/neznamy/tab/shared/command/PlayerCommand.java b/shared/src/main/java/me/neznamy/tab/shared/command/PlayerCommand.java
index 170e8befd..fe0606a00 100644
--- a/shared/src/main/java/me/neznamy/tab/shared/command/PlayerCommand.java
+++ b/shared/src/main/java/me/neznamy/tab/shared/command/PlayerCommand.java
@@ -33,11 +33,11 @@ public class PlayerCommand extends PropertyCommand {
         String server = null;
         if (args[args.length-2].equals("-w")) {
             world = args[args.length-1];
-            value = value.substring(0, value.length()-world.length()-4);
+            value = value.startsWith("-w") ? "" : value.substring(0, value.length()-world.length()-4);
         }
         if (args[args.length-2].equals("-s")) {
             server = args[args.length-1];
-            value = value.substring(0, value.length()-server.length()-4);
+            value = value.startsWith("-s") ? "" : value.substring(0, value.length()-server.length()-4);
         }
         if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
             value = value.substring(1, value.length()-1);
diff --git a/shared/src/main/java/me/neznamy/tab/shared/command/PlayerUUIDCommand.java b/shared/src/main/java/me/neznamy/tab/shared/command/PlayerUUIDCommand.java
index ac32b6db4..0c46cd6ef 100644
--- a/shared/src/main/java/me/neznamy/tab/shared/command/PlayerUUIDCommand.java
+++ b/shared/src/main/java/me/neznamy/tab/shared/command/PlayerUUIDCommand.java
@@ -38,11 +38,11 @@ public class PlayerUUIDCommand extends PropertyCommand {
         String server = null;
         if (args[args.length-2].equals("-w")) {
             world = args[args.length-1];
-            value = value.substring(0, value.length()-world.length()-4);
+            value = value.startsWith("-w") ? "" : value.substring(0, value.length()-world.length()-4);
         }
         if (args[args.length-2].equals("-s")) {
             server = args[args.length-1];
-            value = value.substring(0, value.length()-server.length()-4);
+            value = value.startsWith("-s") ? "" : value.substring(0, value.length()-server.length()-4);
         }
         if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
             value = value.substring(1, value.length()-1);