Add PacketEvent#isPlayerTemporary, check for player updates

This should address issues with temporary players by hopefully returning them less often

modules/API/src/main/java/com/comphenix/protocol/events/PacketEvent.java

@@ -33,6 +33,7 @@ import com.comphenix.protocol.async.AsyncMarker;
 import com.comphenix.protocol.error.PluginContext;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.injector.server.TemporaryPlayer;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
@@ -321,7 +322,41 @@ public class PacketEvent extends EventObject implements Cancellable {
 	 * @return The player associated with this event.
 	 */
 	public Player getPlayer() {
-		return playerReference.get();
+		Player player = playerReference.get();
+
+		// Check if the player has been updated so we can do more stuff
+		if (player instanceof TemporaryPlayer) {
+			Player updated = player.getPlayer();
+			if (updated != null && !(updated instanceof TemporaryPlayer)) {
+				playerReference.clear();
+				playerReference = new WeakReference<>(updated);
+				return updated;
+			}
+		}
+
+		return player;
+	}
+
+	/**
+	 * Whether or not the player in this PacketEvent is temporary (i.e. they don't have a true player instance yet).
+	 * Temporary players have a limited subset of methods that may be used:
+	 * <ul>
+	 *     <li>getPlayer</li>
+	 *     <li>getAddress</li>
+	 *     <li>getServer</li>
+	 *     <li>chat</li>
+	 *     <li>sendMessage</li>
+	 *     <li>kickPlayer</li>
+	 *     <li>isOnline</li>
+	 * </ul>
+	 *
+	 * Anything else will throw an UnsupportedOperationException. Use this check before calling other methods when
+	 * dealing with packets early in the login sequence or if you get the aforementioned exception.
+	 *
+	 * @return True if the player is temporary, false if not.
+	 */
+	public boolean isPlayerTemporary() {
+		return getPlayer() instanceof TemporaryPlayer;
 	}
 	
 	/**

modules/API/src/main/java/com/comphenix/protocol/injector/server/SocketInjector.java

@@ -4,10 +4,10 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.Socket;
 import java.net.SocketAddress;
 
-import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.events.NetworkMarker;
 
+import org.bukkit.entity.Player;
+
 /**
  * Represents an injector that only gives access to a player's socket.
  * 

modules/API/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayer.java

@@ -1,19 +1,19 @@
 package com.comphenix.protocol.injector.server;
 
 /**
- * Able to store a socket injector.
+ * A temporary player created by ProtocolLib when a true player instance does not exist.
  * <p>
- * A necessary hack.
+ * Also able to store a socket injector
- * @author Kristian
+ * </p>
  */
-class InjectorContainer {
+public class TemporaryPlayer {
 	private volatile SocketInjector injector;
 
-	public SocketInjector getInjector() {
+	SocketInjector getInjector() {
 		return injector;
 	}
 
-	public void setInjector(SocketInjector injector) {
+	void setInjector(SocketInjector injector) {
 		if (injector == null)
 			throw new IllegalArgumentException("Injector cannot be NULL.");
 		this.injector = injector;

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java

@@ -910,7 +910,7 @@ public class ChannelInjector extends ByteToMessageDecoder implements Injector {
 
 		@Override
 		public Player getUpdatedPlayer() {
-			return injector.updated;
+			return injector.updated != null ? injector.updated : getPlayer();
 		}
 
 		@Override

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java

@@ -71,7 +71,7 @@ public abstract class AbstractInputStreamLookup {
 		Player player = previous.getPlayer();
 		
 		// Default implementation
-		if (player instanceof InjectorContainer) {
+		if (player instanceof TemporaryPlayer) {
 			TemporaryPlayerFactory.setInjectorInPlayer(player, current);
 		}
 	}

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayerFactory.java

@@ -47,8 +47,8 @@ public class TemporaryPlayerFactory {
 	 * @return The referenced player injector, or NULL if none can be found.
 	 */
 	public static SocketInjector getInjectorFromPlayer(Player player) {
-		if (player instanceof InjectorContainer) {
+		if (player instanceof TemporaryPlayer) {
-			return ((InjectorContainer) player).getInjector();
+			return ((TemporaryPlayer) player).getInjector();
 		} 
 		return null;
 	}
@@ -59,7 +59,7 @@ public class TemporaryPlayerFactory {
 	 * @param injector - the injector to store.
 	 */
 	public static void setInjectorInPlayer(Player player, SocketInjector injector) {
-		((InjectorContainer) player).setInjector(injector);
+		((TemporaryPlayer) player).setInjector(injector);
 	}
 	
 	/**
@@ -88,7 +88,7 @@ public class TemporaryPlayerFactory {
 			@Override
 			public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
 				String methodName = method.getName();
-				SocketInjector injector = ((InjectorContainer) obj).getInjector();
+				SocketInjector injector = ((TemporaryPlayer) obj).getInjector();
 				
 				if (injector == null)
 					throw new IllegalStateException("Unable to find injector.");
@@ -152,7 +152,7 @@ public class TemporaryPlayerFactory {
 				public int accept(Method method) {
 					// Do not override the object method or the superclass methods
 					if (method.getDeclaringClass().equals(Object.class) ||
-						method.getDeclaringClass().equals(InjectorContainer.class))
+						method.getDeclaringClass().equals(TemporaryPlayer.class))
 						return 0;
 					else 
 						return 1;
@@ -162,7 +162,7 @@ public class TemporaryPlayerFactory {
     	
 		// CGLib is amazing
     	Enhancer ex = new Enhancer();
-    	ex.setSuperclass(InjectorContainer.class);
+    	ex.setSuperclass(TemporaryPlayer.class);
     	ex.setInterfaces(new Class[] { Player.class });
 		ex.setCallbacks(new Callback[] { NoOp.INSTANCE, implementation });
 		ex.setCallbackFilter(callbackFilter);
@@ -179,7 +179,7 @@ public class TemporaryPlayerFactory {
 	public Player createTemporaryPlayer(Server server, SocketInjector injector) {
 		Player temporary = createTemporaryPlayer(server);
 		
-		((InjectorContainer) temporary).setInjector(injector);
+		((TemporaryPlayer) temporary).setInjector(injector);
 		return temporary;
 	}