Handle exceptions in injected code.

This is very important, otherwise the server may crash unnecessarily.

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java

@@ -49,7 +49,6 @@ import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.async.AsyncFilterManager;
 import com.comphenix.protocol.async.AsyncMarker;
-import com.comphenix.protocol.error.DetailedErrorReporter;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.*;
 import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
@@ -142,7 +141,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 	 * Only create instances of this class if protocol lib is disabled.
 	 * @param unhookTask 
 	 */
-	public PacketFilterManager(ClassLoader classLoader, Server server, DelayedSingleTask unhookTask, DetailedErrorReporter reporter) {
+	public PacketFilterManager(ClassLoader classLoader, Server server, DelayedSingleTask unhookTask, ErrorReporter reporter) {
 		if (reporter == null)
 			throw new IllegalArgumentException("reporter cannot be NULL.");
 		if (classLoader == null)
@@ -175,7 +174,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 		try {
 			// Initialize injection mangers
 			this.playerInjection = new PlayerInjectionHandler(classLoader, reporter, isInjectionNecessary, this, packetListeners, server);
-			this.packetInjector = new PacketInjector(classLoader, this, playerInjection);
+			this.packetInjector = new PacketInjector(classLoader, this, playerInjection, reporter);
 			this.asyncFilterManager = new AsyncFilterManager(reporter, server.getScheduler(), this);
 			
 			// Attempt to load the list of server and client packets

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketInjector.java

@@ -31,6 +31,7 @@ import net.minecraft.server.Packet;
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.Enhancer;
 
+import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
@@ -51,6 +52,9 @@ class PacketInjector {
 	// The packet filter manager
 	private ListenerInvoker manager;
 	
+	// Error reporter
+	private ErrorReporter reporter;
+	
 	// Allows us to determine the sender
 	private PlayerInjectionHandler playerInjection;
 	
@@ -61,11 +65,12 @@ class PacketInjector {
 	private ClassLoader classLoader;
 			
 	public PacketInjector(ClassLoader classLoader, ListenerInvoker manager, 
-						  PlayerInjectionHandler playerInjection) throws IllegalAccessException {
+						  PlayerInjectionHandler playerInjection, ErrorReporter reporter) throws IllegalAccessException {
 		
 		this.classLoader = classLoader;
 		this.manager = manager;
 		this.playerInjection = playerInjection;
+		this.reporter = reporter;
 		this.readModifier = new ConcurrentHashMap<Integer, ReadPacketModifier>();
 		initialize();
 	}
@@ -133,7 +138,7 @@ class PacketInjector {
 		Class proxy = ex.createClass();
 		
 		// Create the proxy handler
-		ReadPacketModifier modifier = new ReadPacketModifier(packetID, this);
+		ReadPacketModifier modifier = new ReadPacketModifier(packetID, this, reporter);
 		readModifier.put(packetID, modifier);
 		
 		// Add a static reference

ProtocolLib/src/main/java/com/comphenix/protocol/injector/ReadPacketModifier.java

@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.WeakHashMap;
 
 import com.comphenix.protocol.Packets;
+import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 
@@ -44,12 +45,16 @@ class ReadPacketModifier implements MethodInterceptor {
 	private PacketInjector packetInjector;
 	private int packetID;
 	
+	// Report errors
+	private ErrorReporter reporter;
+	
 	// Whether or not a packet has been cancelled
 	private static Map<Object, Object> override = Collections.synchronizedMap(new WeakHashMap<Object, Object>());
 	
-	public ReadPacketModifier(int packetID, PacketInjector packetInjector) {
+	public ReadPacketModifier(int packetID, PacketInjector packetInjector, ErrorReporter reporter) {
 		this.packetID = packetID;
 		this.packetInjector = packetInjector;
+		this.reporter = reporter;
 	}
 	
 	/**
@@ -102,6 +107,7 @@ class ReadPacketModifier implements MethodInterceptor {
 		if (returnValue == null && 
 				Arrays.equals(method.getParameterTypes(), parameters)) {
 			
+			try {
 				// We need this in order to get the correct player
 				DataInputStream input = (DataInputStream) args[0];
 	
@@ -124,6 +130,10 @@ class ReadPacketModifier implements MethodInterceptor {
 						packetInjector.scheduleDataInputRefresh(event.getPlayer());
 					}
 				}
+			} catch (Throwable e) {
+				// Minecraft cannot handle this error
+				reporter.reportDetailed(this, "Cannot handle clienet packet.", e, args[0]);
+			}
 		}
 		
 		return returnValue;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java

@@ -217,7 +217,12 @@ class InjectedServerConnection {
 				// Is this a normal Minecraft object?
 				if (!(inserting instanceof Factory)) {
 					// If so, copy the content of the old element to the new
+					try {
 						ObjectCloner.copyTo(inserting, replacement, inserting.getClass());
+					} catch (Throwable e) {
+						reporter.reportDetailed(InjectedServerConnection.this, "Cannot copy old " + inserting + 
+								 				" to new.", e, inserting, replacement);
+					}
 				}
 			}
 			

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java

@@ -95,6 +95,7 @@ class NetLoginInjector {
 		PlayerInjector injected = injectedLogins.get(removing);
 		
 		if (injected != null) {
+			try {
 				PlayerInjector newInjector = null;
 				Player player = injected.getPlayer();
 				
@@ -118,7 +119,10 @@ class NetLoginInjector {
 						newInjector.setNetworkManager(injected.getNetworkManager(), true);
 				}
 				
-			//logger.warning("Using alternative cleanup method.");
+			} catch (Throwable e) {
+				// Don't leak this to Minecraft
+				reporter.reportDetailed(this, "Cannot cleanup NetLoginHandler.", e, removing);
+			}
 		}
 	}
 	

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java

@@ -502,6 +502,7 @@ abstract class PlayerInjector {
 	 * @return The given packet, or the packet replaced by the listeners.
 	 */
 	public Packet handlePacketSending(Packet packet) {
+		try {
 			// Get the packet ID too
 			Integer id = invoker.getPacketID(packet);
 			Player currentPlayer = player;
@@ -541,6 +542,10 @@ abstract class PlayerInjector {
 				return event.getPacket().getHandle();
 			}
 			
+		} catch (Throwable e) {
+			reporter.reportDetailed(this, "Cannot handle server packet.", e, packet);
+		}
+		
 		return packet;
 	}