Merge pull request #223 from SpigotMC/master

SpigotMC#2521: Using replace instead of replaceAll
HexagonMC · Sep 5, 2018 · 57e70cc · 57e70cc
2 parents d472c1f + 9886021
commit 57e70cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -75,7 +75,7 @@ public void setId(String id)
 
         public String getId()
         {
-            return uniqueId.toString().replaceAll( "-", "" );
+            return uniqueId.toString().replace( "-", "" );
         }
     }
 

diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -588,7 +588,7 @@ public void setSettings(ClientSettings settings)
     @Override
     public Locale getLocale()
     {
-        return ( locale == null && settings != null ) ? locale = Locale.forLanguageTag( settings.getLocale().replaceAll( "_", "-" ) ) : locale;
+        return ( locale == null && settings != null ) ? locale = Locale.forLanguageTag( settings.getLocale().replace( '_', '-' ) ) : locale;
     }
 
     @Override

diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -631,7 +631,7 @@ public void setUniqueId(UUID uuid)
     @Override
     public String getUUID()
     {
-        return uniqueId.toString().replaceAll( "-", "" );
+        return uniqueId.toString().replace( "-", "" );
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ public void setId(String id) @@
             public String getId()
             {
-                return uniqueId.toString().replaceAll( "-", "" );
+                return uniqueId.toString().replace( "-", "" );
             }
         }
@@ Expand Down @@