Remove redundant player IP lookup call.

cnaude · Jan 17, 2015 · dad8948 · dad8948
1 parent 987d58e
commit dad8948
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -256,7 +256,7 @@
     <dependency>
       <groupId>com.cnaude.protocol</groupId>
       <artifactId>ProtocolLib</artifactId>
-      <version>3.6.3</version>
+      <version>3.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -1381,8 +1381,10 @@ public void loadUuidCache() {
         }
     }
 
-    public String getPlayerHost(Player player) {
-        final String playerIP = player.getAddress().getAddress().getHostAddress();
+    public String getPlayerHost(final String playerIP) {
+        if (playerIP == null) {
+            return "unknown";
+        }
         if (hostCache.containsKey(playerIP)) {
             return hostCache.get(playerIP);
         } else {

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -548,7 +548,7 @@ public String playerTokenizer(Player player, String message) {
         String group = plugin.getPlayerGroup(player);
         String displayName = player.getDisplayName();
         String playerIP = player.getAddress().getAddress().getHostAddress();
-        String host = plugin.getPlayerHost(player);
+        String host = plugin.getPlayerHost(playerIP);
         String worldName = "";
         String worldAlias = "";
         String worldColor = "";