Allow server@Server to be used on current server

DenizenScript · Oct 25, 2015 · f2b9c75 · f2b9c75
1 parent 1813ac7
commit f2b9c75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/bungee/dServer.java b/src/main/java/net/gnomeffinway/depenizen/objects/bungee/dServer.java
@@ -6,6 +6,7 @@
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizencore.tags.TagContext;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -39,7 +40,7 @@ public static dServer valueOf(String string, TagContext context) {
         ////////
         // Match faction name
 
-        string = string.toLowerCase().replace("server@", "");
+        string = CoreUtilities.toLowerCase(string).replace("server@", "");
         if (onlineServers.containsKey(string)) {
             return onlineServers.get(string);
         }
@@ -49,7 +50,7 @@ public static dServer valueOf(String string, TagContext context) {
     }
 
     public static boolean matches(String arg) {
-        if (onlineServers.containsKey(arg.toLowerCase().replace("server@", "")))
+        if (onlineServers.containsKey(CoreUtilities.toLowerCase(arg).replace("server@", "")))
             return true;
 
         return false;

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/bungee/SocketClient.java b/src/main/java/net/gnomeffinway/depenizen/support/bungee/SocketClient.java
@@ -131,6 +131,7 @@ public void run() {
                         packet.deserialize(data);
                         if (packet.isAccepted()) {
                             dB.log("Successfully registered name with the server");
+                            dServer.addOnlineServer(this.registrationName);
                             for (String server : packet.getServerList()) {
                                 if (!server.isEmpty())
                                     dServer.addOnlineServer(server);