Update asynchronous manager and handle static senders in reports.

ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolLibrary.java

@@ -217,7 +217,7 @@ public class ProtocolLibrary extends JavaPlugin {
 			
 			@Override
 			protected Report filterReport(Object sender, Report report, boolean detailed) {
-				String canonicalName = ReportType.getReportName(sender.getClass(), report.getType());
+				String canonicalName = ReportType.getReportName(sender, report.getType());
 				String reportName = Iterables.getLast(Splitter.on("#").split(canonicalName)).toUpperCase();
 				
 				if (config != null && config.getModificationCount() != lastModCount) {

ProtocolLib/src/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java

@@ -59,7 +59,7 @@ public class DelegatedErrorReporter implements ErrorReporter {
 	 * Invoked before an error report is passed on to the underlying error reporter.
 	 * <p>
 	 * To cancel a report, return NULL.
-	 * @param sender - the sender component.
+	 * @param sender - the sender instance or class.
 	 * @param report - the error report.
 	 * @param detailed - whether or not the report will be displayed in detail.
 	 * @return The report to pass on, or NULL to cancel it.

ProtocolLib/src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java

@@ -224,7 +224,7 @@ public class DetailedErrorReporter implements ErrorReporter {
 	 */
 	private String getSenderName(Object sender) {
 		if (sender != null)
-			return sender.getClass().getSimpleName();
+			return ReportType.getSenderClass(sender).getSimpleName();
 		else
 			return "NULL";
 	}
@@ -345,7 +345,7 @@ public class DetailedErrorReporter implements ErrorReporter {
 		// We can't only rely on toString.
 		if (value == null) {
 			return "[NULL]";
-		} if (isSimpleType(value)) {
+		} if (isSimpleType(value) || value instanceof Class<?>) {
 			return value.toString();
 		} else {
 			try {

ProtocolLib/src/main/java/com/comphenix/protocol/error/ReportType.java

@@ -46,6 +46,39 @@ public class ReportType {
 		return errorFormat;
 	}
 	
+	/**
+	 * Retrieve the class of the given sender.
+	 * <p>
+	 * If the sender is already a Class, we return it.
+	 * @param sender - the sender to look up.
+	 * @return The class of the sender.
+	 */
+	public static Class<?> getSenderClass(Object sender) {
+		if (sender == null)
+			throw new IllegalArgumentException("sender cannot be NUll.");
+		else if (sender instanceof Class<?>)
+			return (Class<?>) sender;
+		else
+			return sender.getClass();
+	}
+	
+	/**
+	 * Retrieve the full canonical name of a given report type.
+	 * <p>
+	 * Note that the sender may be a class (for static callers), in which 
+	 * case it will be used directly instead of its getClass() method.
+	 * <p>
+	 * It is thus not advisable for class classes to report reports.
+	 * @param sender - the sender, or its class.
+	 * @param type - the report type.
+	 * @return The full canonical name.
+	 */
+	public static String getReportName(Object sender, ReportType type) {
+		if (sender == null)
+			throw new IllegalArgumentException("sender cannot be NUll.");
+		return getReportName(getSenderClass(sender), type);
+	}
+	
 	/**
 	 * Retrieve the full canonical name of a given report type.
 	 * <p>
@@ -54,7 +87,7 @@ public class ReportType {
 	 * @param type - the report instance.
 	 * @return The full canonical name.
 	 */
-	public static String getReportName(Class<?> sender, ReportType type) {
+	private static String getReportName(Class<?> sender, ReportType type) {
 		if (sender == null)
 			throw new IllegalArgumentException("sender cannot be NUll.");
 		

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

@@ -362,6 +362,10 @@ public class DelayedPacketManager implements ProtocolManager, InternalManager {
 			return asyncManager;
 	}
 	
+	/**
+	 * Update the asynchronous manager. This must be set.
+	 * @param asyncManager - the asynchronous manager.
+	 */
 	public void setAsynchronousManager(AsynchronousManager asyncManager) {
 		this.asyncManager = asyncManager;
 	}

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

@@ -268,6 +268,10 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 			// We need to delay this until we know if Netty is enabled
 			final DelayedPacketManager delayed = new DelayedPacketManager(reporter);
 			
+			// They must reference each other
+			delayed.setAsynchronousManager(asyncManager);
+			asyncManager.setManager(delayed);
+			
 			Futures.addCallback(BukkitFutures.nextEvent(library, WorldInitEvent.class), new FutureCallback<WorldInitEvent>() {
 				@Override
 				public void onSuccess(WorldInitEvent event) {
@@ -297,7 +301,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 				
 				@Override
 				public void onFailure(Throwable error) {
-					reporter.reportWarning(this, Report.newBuilder(REPORT_TEMPORARY_EVENT_ERROR).error(error));
+					reporter.reportWarning(PacketFilterManager.class, Report.newBuilder(REPORT_TEMPORARY_EVENT_ERROR).error(error));
 				}
 			});