Add ability for CommandParserArgs to only return online players - sho…

…uld fix #1679
ForgeEssentials · Aug 4, 2015 · 06e1aba · 06e1aba
1 parent 281138a
commit 06e1aba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/com/forgeessentials/api/UserIdent.java b/src/main/java/com/forgeessentials/api/UserIdent.java
@@ -329,6 +329,11 @@ public GameProfile getGameProfile()
         return gameProfile;
     }
 
+    public boolean isOnline()
+    {
+        return MinecraftServer.getServer().getConfigurationManager().playerEntityList.contains(player);
+    }
+
     /* ------------------------------------------------------------ */
 
     public static UserIdent fromString(String string)

diff --git a/src/main/java/com/forgeessentials/teleport/CommandTPA.java b/src/main/java/com/forgeessentials/teleport/CommandTPA.java
@@ -68,7 +68,7 @@ public void parse(final CommandParserArgs arguments)
             return;
         }
 
-        final UserIdent player = arguments.parsePlayer(true);
+        final UserIdent player = arguments.parsePlayer(true, true);
         if (arguments.isEmpty())
         {
             if (arguments.isTabCompletion)

diff --git a/src/main/java/com/forgeessentials/util/CommandParserArgs.java b/src/main/java/com/forgeessentials/util/CommandParserArgs.java
@@ -111,10 +111,16 @@ public boolean hasPlayer()
     @Deprecated
     public UserIdent parsePlayer()
     {
-        return parsePlayer(true);
+        return parsePlayer(true, false);
     }
 
+    @Deprecated
     public UserIdent parsePlayer(boolean mustExist)
+    {
+        return parsePlayer(mustExist, false);
+    }
+
+    public UserIdent parsePlayer(boolean mustExist, boolean mustBeOnline)
     {
         if (isTabCompletion && size() == 1)
         {
@@ -142,6 +148,8 @@ public UserIdent parsePlayer(boolean mustExist)
                 UserIdent ident = UserIdent.get(name, sender, mustExist);
                 if (mustExist && (ident == null || !ident.hasUuid()))
                     throw new TranslatedCommandException("Player %s not found", name);
+                else if (mustBeOnline && !ident.isOnline())
+                    throw new TranslatedCommandException("Player %s is not online", name);
                 return ident;
             }
         }