diff --git a/build.gradle b/build.gradle
index a0fcffed..65d17770 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ processResources {
with copySpec {
from 'src/main/resources'
- filter(ReplaceTokens, tokens: ['fullVersion': fullVersion])
+ filter(ReplaceTokens, tokens: ['$fullVersion': fullVersion])
}
}
diff --git a/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java b/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java
index db7e7032..00b0261f 100644
--- a/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java
+++ b/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java
@@ -1,5 +1,16 @@
package com.comphenix.protocol.concurrency;
+import com.comphenix.protocol.utility.SafeCacheBuilder;
+import com.comphenix.protocol.utility.Util;
+import com.google.common.base.Function;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.RemovalListener;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+
+import org.bukkit.entity.Player;
+
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.Iterator;
@@ -7,18 +18,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.bukkit.entity.Player;
-
-import com.comphenix.protocol.utility.SafeCacheBuilder;
-import com.comphenix.protocol.utility.Util;
-import com.google.common.base.Function;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-
/**
* Represents a concurrent player map.
*
@@ -37,7 +36,7 @@ public class ConcurrentPlayerMap extends AbstractMap imp
ADDRESS {
@Override
public Object apply(Player player) {
- return player.getAddress();
+ return player == null ? null : player.getAddress();
}
},
@@ -47,7 +46,7 @@ public class ConcurrentPlayerMap extends AbstractMap imp
NAME {
@Override
public Object apply(Player player) {
- return player.getName();
+ return player == null ? null : player.getName();
}
},
}
@@ -55,17 +54,17 @@ public class ConcurrentPlayerMap extends AbstractMap imp
/**
* An internal map of player keys to values.
*/
- protected ConcurrentMap