Code cleanup, remove some ancient compatibility

modules/API/src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java

@@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.bukkit.plugin.Plugin;
-
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
@@ -36,10 +34,11 @@ import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.timing.TimedListenerManager;
 import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
 import com.comphenix.protocol.timing.TimedTracker;
-import com.comphenix.protocol.utility.WrappedScheduler;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 
+import org.bukkit.plugin.Plugin;
+
 /**
  * Represents a handler for an asynchronous event.
  * <p>
@@ -345,8 +344,7 @@ public class AsyncListenerHandler {
 	}
 	
 	private void scheduleAsync(Runnable runnable) {
-		// Handle deprecation
-		WrappedScheduler.runAsynchronouslyRepeat(listener.getPlugin(), filterManager.getScheduler(), runnable, 0L, -1L);
+		listener.getPlugin().getServer().getScheduler().runTaskAsynchronously(listener.getPlugin(), runnable);
 	}
 	
 	/**

modules/API/src/main/java/com/comphenix/protocol/utility/WrappedScheduler.java

@@ -1,92 +0,0 @@
-package com.comphenix.protocol.utility;
-
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
-/**
- * Allows us to stay backwards compatible with older versions of Bukkit.
- * 
- * @author Kristian
- */
-public class WrappedScheduler {
-	/**
-	 * Represents a backwards compatible Bukkit task.
-	 */
-	public static interface TaskWrapper {
-		/**
-		 * Cancel the current task.
-		 */
-		public void cancel();
-	}
-	
-	/**
-	 * Schedule a given task for a single asynchronous execution.
-	 * @param plugin - the owner plugin.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task.
-	 * @return A cancel token.
-	 */
-	public static TaskWrapper runAsynchronouslyOnce(final Plugin plugin, Runnable runnable, long firstDelay) {
-		return runAsynchronouslyRepeat(plugin, plugin.getServer().getScheduler(), runnable, firstDelay, -1L);
-	}
-	
-	/**
-	 * Schedule a given task for multiple asynchronous executions.
-	 * @param plugin - the owner plugin.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task for the first time.
-	 * @param repeatDelay - the amount of time inbetween each execution. If less than zero, the task is only executed once.
-	 * @return A cancel token.
-	 */
-	public static TaskWrapper runAsynchronouslyRepeat(final Plugin plugin, Runnable runnable, long firstDelay, long repeatDelay) {
-		return runAsynchronouslyRepeat(plugin, plugin.getServer().getScheduler(), runnable, firstDelay, repeatDelay);
-	}
-	
-	/**
-	 * Schedule a given task for asynchronous execution.
-	 * @param plugin - the owner plugin.
-	 * @param scheduler - the current Bukkit scheduler.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task for the first time.
-	 * @param repeatDelay - the amount of time inbetween each execution. If less than zero, the task is only executed once.
-	 * @return A cancel token.
-	 */
-	public static TaskWrapper runAsynchronouslyRepeat(final Plugin plugin, final BukkitScheduler scheduler, Runnable runnable, long firstDelay, long repeatDelay) {
-		try {
-			@SuppressWarnings("deprecation")
-			final int taskID = scheduler.scheduleAsyncRepeatingTask(plugin, runnable, firstDelay, repeatDelay);
-
-			// Return the cancellable object
-			return new TaskWrapper() {
-				@Override
-				public void cancel() {
-					scheduler.cancelTask(taskID);
-				}
-			};
-			
-		} catch (NoSuchMethodError e) {
-			return tryUpdatedVersion(plugin, scheduler, runnable, firstDelay, repeatDelay);
-		}
-	}
-	
-	/**
-	 * Attempt to do the same with the updated scheduling method.
-	 * @param plugin - the owner plugin.
-	 * @param scheduler - the current Bukkit scheduler.
-	 * @param runnable - the task to run.
-	 * @param firstDelay - the amount of time to wait until executing the task for the first time.
-	 * @param repeatDelay - the amount of time inbetween each execution. If less than zero, the task is only executed once.
-	 * @return A cancel token.
-	 */
-	private static TaskWrapper tryUpdatedVersion(final Plugin plugin, final BukkitScheduler scheduler, Runnable runnable, long firstDelay, long repeatDelay) {
-		final BukkitTask task = scheduler.runTaskTimerAsynchronously(plugin, runnable, firstDelay, repeatDelay);
-		
-		return new TaskWrapper() {
-			@Override
-			public void cancel() {
-				task.cancel();
-			}
-		};
-	}
-}

modules/API/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java

@@ -14,7 +14,6 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-
 package com.comphenix.protocol.wrappers;
 
 import java.lang.ref.WeakReference;
@@ -22,25 +21,10 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
-import org.bukkit.WorldType;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.Vector;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
@@ -66,6 +50,16 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+
 /**
  * Contains several useful equivalent converters for normal Bukkit types.
  * 
@@ -123,7 +117,7 @@ public class BukkitConverters {
 	 * Represents a typical equivalence converter.
 	 * 
 	 * @author Kristian
-	 * @param <T> - type that can be converted.
+	 * @param <TType> - type that can be converted.
 	 */
 	public static abstract class IgnoreNullConverter<TType> implements EquivalentConverter<TType> {
 		@Override

modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java

@@ -16,21 +16,8 @@
  */
 package com.comphenix.protocol.wrappers;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.lang.Validate;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
+import java.lang.reflect.*;
+import java.util.*;
 
 import com.comphenix.protocol.injector.BukkitUnwrapper;
 import com.comphenix.protocol.reflect.FieldAccessException;
@@ -47,6 +34,10 @@ import com.comphenix.protocol.wrappers.collection.ConvertedMap;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableBiMap;
 
+import org.apache.commons.lang.Validate;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+
 /**
  * Represents a DataWatcher in 1.8 thru 1.10
  * 
@@ -419,7 +410,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * Sets the DataWatcher Item at a given index to a new value.
 	 * 
 	 * @param index Index of the object to set
-	 * @param Serializer Serializer from {@link Serializer#get(Class)}
+	 * @param serializer Serializer from {@link Registry#get(Class)}
 	 * @param value New value
 	 * @param update Whether or not to inform the client
 	 * 
@@ -463,7 +454,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 * @param value Wrapped value
 	 * @param update Whether or not to inform the client
 	 * 
-	 * @see {@link #setObject(WrappedDataWatcherObject, Object)}
+	 * @see #setObject(WrappedDataWatcherObject, Object)
 	 */
 	public void setObject(WrappedDataWatcherObject object, WrappedWatchableObject value, boolean update) {
 		setObject(object, value.getRawValue(), update);
@@ -893,7 +884,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 *   <li>Float</li>
 	 *   <li>String</li>
 	 *   <li>IChatBaseComponent</li>
-	 *   <li>Optional&lt;ItemStack&gt;</li>
+	 *   <li>ItemStack</li>
 	 *   <li>Optional&lt;IBlockData&gt;</li>
 	 *   <li>Boolean</li>
 	 *   <li>Vector3f</li>
@@ -901,6 +892,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	 *   <li>Optional&lt;BlockPosition&gt;</li>
 	 *   <li>EnumDirection</li>
 	 *   <li>Optional&lt;UUID&gt;</li>
+	 *   <li>NBTTagCompound</li>
 	 * </ul>
 	 *
 	 * @author dmulloy2
@@ -1078,5 +1070,13 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		public static Serializer getUUIDSerializer(boolean optional) {
 			return get(UUID.class, optional);
 		}
+
+		/**
+		 * Gets the serializer for NBT Compound tags
+		 * @return The serializer
+		 */
+		public static Serializer getNBTCompoundSerializer() {
+			return get(MinecraftReflection.getNBTCompoundClass(), false);
+		}
 	}
 }

modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java

@@ -27,6 +27,9 @@ import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
+import com.comphenix.protocol.wrappers.nbt.NbtBase;
+import com.comphenix.protocol.wrappers.nbt.NbtCompound;
+import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.google.common.base.Optional;
 
 /**
@@ -235,6 +238,8 @@ public class WrappedWatchableObject extends AbstractWrapper {
 			return BlockPosition.getConverter().getSpecific(value);
 		} else if (is(EnumWrappers.getDirectionClass(), value)) {
 			return EnumWrappers.getDirectionConverter().getSpecific(value);
+		} else if (is(MinecraftReflection.getNBTCompoundClass(), value)) {
+			return NbtFactory.fromNMSCompound(value);
 		}
 
 		// Legacy classes
@@ -277,6 +282,8 @@ public class WrappedWatchableObject extends AbstractWrapper {
 			return BlockPosition.getConverter().getGeneric(MinecraftReflection.getBlockPositionClass(), (BlockPosition) wrapped);
 		} else if (wrapped instanceof Direction) {
 			return EnumWrappers.getDirectionConverter().getGeneric(EnumWrappers.getDirectionClass(), (Direction) wrapped);
+		} else if (wrapped instanceof NbtCompound) {
+			return NbtFactory.fromBase((NbtCompound) wrapped).getHandle();
 		}
 
 		// Legacy classes

modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java

@@ -133,7 +133,7 @@ public class NbtFactory {
 	 * Set the NBT compound tag of a given item stack.
 	 * <p>
 	 * The item stack must be a wrapper for a CraftItemStack. Use
-	 * {@link MinecraftReflection#getCraftItemStack(ItemStack)} if not.
+	 * {@link MinecraftReflection#getBukkitItemStack(Object)} if not.
 	 * @param stack - the item stack, cannot be air.
 	 * @param compound - the new NBT compound, or NULL to remove it.
 	 * @throws IllegalArgumentException If the stack is not a CraftItemStack, or it represents air.
@@ -151,7 +151,7 @@ public class NbtFactory {
 	 * material, damage value or count.
 	 * <p>
 	 * The item stack must be a wrapper for a CraftItemStack. Use
-	 * {@link MinecraftReflection#getCraftItemStack(ItemStack)} if not.
+	 * {@link MinecraftReflection#getBukkitItemStack(Object)} if not.
 	 * @param stack - the item stack.
 	 * @return A wrapper for its NBT tag.
 	 */

modules/ProtocolLib/src/main/java/com/comphenix/protocol/PacketLogging.java

@@ -23,19 +23,7 @@ import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-import org.apache.commons.io.HexDump;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
+import java.util.logging.*;
 
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.PacketType.Sender;
@@ -45,6 +33,13 @@ import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.netty.WirePacket;
 import com.google.common.base.Charsets;
 
+import org.apache.commons.io.HexDump;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+
 /**
  * Logs packets to a given stream
  * @author dmulloy2
@@ -99,16 +94,16 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 						type = PacketType.findCurrent(protocol, pSender, id);
 					} catch (NumberFormatException ex) { // Check packet names
 						String name = args[2];
-						outer: for (PacketType packet : PacketType.values()) {
+						for (PacketType packet : PacketType.values()) {
 							if (packet.getProtocol() == protocol && packet.getSender() == pSender) {
 								if (packet.name().equalsIgnoreCase(name)) {
 									type = packet;
-									break outer;
+									break;
 								}
 								for (String className : packet.getClassNames()) {
 									if (className.equalsIgnoreCase(name)) {
 										type = packet;
-										break outer;
+										break;
 									}
 								}
 							}
@@ -248,9 +243,8 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 		return plugin;
 	}
 
-	private static enum LogLocation {
-		CONSOLE,
-		FILE;
+	private enum LogLocation {
+		CONSOLE, FILE
 	}
 
 	private static class LogFormatter extends Formatter {

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

@@ -237,8 +237,6 @@ public class ProtocolLib extends JavaPlugin {
 
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			reporter.reportDetailed(this, Report.newBuilder(REPORT_PLUGIN_LOAD_ERROR).error(e).callerParam(protocolManager));
 			disablePlugin();
@@ -268,8 +266,6 @@ public class ProtocolLib extends JavaPlugin {
 				}
 			} catch (OutOfMemoryError e) {
 				throw e;
-			} catch (ThreadDeath e) {
-				throw e;
 			} catch (LinkageError e) {
 				logger.warning("Failed to register command " + command.name() + ": " + e);
 			} catch (Throwable e) {
@@ -410,8 +406,6 @@ public class ProtocolLib extends JavaPlugin {
 			createPacketTask(server);
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			reporter.reportDetailed(this, Report.newBuilder(REPORT_PLUGIN_ENABLE_ERROR).error(e));
 			disablePlugin();
@@ -425,8 +419,6 @@ public class ProtocolLib extends JavaPlugin {
 			}
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (IOException e) {
 			reporter.reportDetailed(this, Report.newBuilder(REPORT_METRICS_IO_ERROR).error(e).callerParam(statistics));
 		} catch (Throwable e) {
@@ -493,7 +485,7 @@ public class ProtocolLib extends JavaPlugin {
 
 			File[] candidates = pluginFolder.listFiles();
 			if (candidates != null) {
-				for (File candidate : pluginFolder.listFiles()) {
+				for (File candidate : candidates) {
 					if (candidate.isFile() && !candidate.equals(loadedFile)) {
 						Matcher match = ourPlugin.matcher(candidate.getName());
 						if (match.matches()) {
@@ -576,8 +568,6 @@ public class ProtocolLib extends JavaPlugin {
 			}, ASYNC_MANAGER_DELAY, ASYNC_MANAGER_DELAY);
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			if (packetTask == -1) {
 				reporter.reportDetailed(this, Report.newBuilder(REPORT_CANNOT_CREATE_TIMEOUT_TASK).error(e));

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

@@ -17,22 +17,46 @@
 
 package com.comphenix.protocol.injector;
 
-import io.netty.channel.Channel;
-
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.annotation.Nullable;
 
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
+import com.comphenix.protocol.AsynchronousManager;
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.async.AsyncFilterManager;
+import com.comphenix.protocol.async.AsyncMarker;
+import com.comphenix.protocol.error.ErrorReporter;
+import com.comphenix.protocol.error.Report;
+import com.comphenix.protocol.error.ReportType;
+import com.comphenix.protocol.events.*;
+import com.comphenix.protocol.injector.netty.ProtocolInjector;
+import com.comphenix.protocol.injector.netty.WirePacket;
+import com.comphenix.protocol.injector.packet.InterceptWritePacket;
+import com.comphenix.protocol.injector.packet.PacketInjector;
+import com.comphenix.protocol.injector.packet.PacketInjectorBuilder;
+import com.comphenix.protocol.injector.packet.PacketRegistry;
+import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
+import com.comphenix.protocol.injector.player.PlayerInjectionHandler.ConflictStrategy;
+import com.comphenix.protocol.injector.player.PlayerInjector.ServerHandlerNull;
+import com.comphenix.protocol.injector.player.PlayerInjectorBuilder;
+import com.comphenix.protocol.injector.spigot.SpigotPacketInjector;
+import com.comphenix.protocol.reflect.FieldAccessException;
+import com.comphenix.protocol.utility.MinecraftReflection;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.utility.Util;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+import io.netty.channel.Channel;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -50,46 +74,6 @@ import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 
-import com.comphenix.protocol.AsynchronousManager;
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.async.AsyncFilterManager;
-import com.comphenix.protocol.async.AsyncMarker;
-import com.comphenix.protocol.error.ErrorReporter;
-import com.comphenix.protocol.error.Report;
-import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.events.ConnectionSide;
-import com.comphenix.protocol.events.ListenerOptions;
-import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.ListeningWhitelist;
-import com.comphenix.protocol.events.NetworkMarker;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.events.PacketListener;
-import com.comphenix.protocol.injector.netty.ProtocolInjector;
-import com.comphenix.protocol.injector.netty.WirePacket;
-import com.comphenix.protocol.injector.packet.InterceptWritePacket;
-import com.comphenix.protocol.injector.packet.PacketInjector;
-import com.comphenix.protocol.injector.packet.PacketInjectorBuilder;
-import com.comphenix.protocol.injector.packet.PacketRegistry;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler.ConflictStrategy;
-import com.comphenix.protocol.injector.player.PlayerInjector.ServerHandlerNull;
-import com.comphenix.protocol.injector.player.PlayerInjectorBuilder;
-import com.comphenix.protocol.injector.spigot.SpigotPacketInjector;
-import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.reflect.FuzzyReflection;
-import com.comphenix.protocol.utility.EnhancerFactory;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.utility.MinecraftVersion;
-import com.comphenix.protocol.utility.Util;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
 public final class PacketFilterManager implements ListenerInvoker, InternalManager {
 
 	public static final ReportType REPORT_CANNOT_LOAD_PACKET_LIST = new ReportType("Cannot load server and client packet list.");
@@ -226,8 +210,6 @@ public final class PacketFilterManager implements ListenerInvoker, InternalManag
 			this.pluginVerifier = new PluginVerifier(builder.getLibrary());
 		} catch (OutOfMemoryError e) {
 			throw e;
-		} catch (ThreadDeath e) {
-			throw e;
 		} catch (Throwable e) {
 			reporter.reportWarning(this, Report.newBuilder(REPORT_PLUGIN_VERIFIER_ERROR).
 					messageParam(e.getMessage()).error(e));
@@ -453,9 +435,7 @@ public final class PacketFilterManager implements ListenerInvoker, InternalManag
 
 			// We only check the recieving whitelist
 			if (whitelist.getOptions().contains(ListenerOptions.INTERCEPT_INPUT_BUFFER)) {
-				for (PacketType type : whitelist.getTypes()) {
-					updated.add(type);
-				}
+				updated.addAll(whitelist.getTypes());
 			}
 		}
 		// Update it
@@ -630,7 +610,6 @@ public final class PacketFilterManager implements ListenerInvoker, InternalManag
 	 * Note that all packets are disabled by default.
 	 *
 	 * @param listener - the listener that requested to enable these filters.
-	 * @param side - which side the event will arrive from.
 	 * @param packets - the packet id(s).
 	 */
 	private void enablePacketFilters(PacketListener listener, Iterable<PacketType> packets) {
@@ -781,7 +760,7 @@ public final class PacketFilterManager implements ListenerInvoker, InternalManag
 
 		if (!filters) {
 			// We may have to delay the packet due to non-asynchronous monitor listeners
-			if (!filters && !Bukkit.isPrimaryThread() && playerInjection.hasMainThreadListener(packet.getType())) {
+			if (!Bukkit.isPrimaryThread() && playerInjection.hasMainThreadListener(packet.getType())) {
 				final NetworkMarker copy = marker;
 
 				server.getScheduler().scheduleSyncDelayedTask(library, new Runnable() {
@@ -990,40 +969,34 @@ public final class PacketFilterManager implements ListenerInvoker, InternalManag
 		if (nettyInjector != null)
 			nettyInjector.inject();
 
-		try {
-			manager.registerEvents(new Listener() {
+		manager.registerEvents(new Listener() {
 
-				@EventHandler(priority = EventPriority.LOWEST)
-				public void onPlayerLogin(PlayerLoginEvent event) {
+			@EventHandler(priority = EventPriority.LOWEST)
+			public void onPlayerLogin(PlayerLoginEvent event) {
 					PacketFilterManager.this.onPlayerLogin(event);
 				}
 
-				@EventHandler(priority = EventPriority.LOWEST)
-				public void onPrePlayerJoin(PlayerJoinEvent event) {
+			@EventHandler(priority = EventPriority.LOWEST)
+			public void onPrePlayerJoin(PlayerJoinEvent event) {
 					PacketFilterManager.this.onPrePlayerJoin(event);
 				}
 
-				@EventHandler(priority = EventPriority.MONITOR)
-				public void onPlayerJoin(PlayerJoinEvent event) {
+			@EventHandler(priority = EventPriority.MONITOR)
+			public void onPlayerJoin(PlayerJoinEvent event) {
 					PacketFilterManager.this.onPlayerJoin(event);
 				}
 
-				@EventHandler(priority = EventPriority.MONITOR)
-				public void onPlayerQuit(PlayerQuitEvent event) {
+			@EventHandler(priority = EventPriority.MONITOR)
+			public void onPlayerQuit(PlayerQuitEvent event) {
 					PacketFilterManager.this.onPlayerQuit(event);
 				}
 
-				@EventHandler(priority = EventPriority.MONITOR)
-				public void onPluginDisabled(PluginDisableEvent event) {
+			@EventHandler(priority = EventPriority.MONITOR)
+			public void onPluginDisabled(PluginDisableEvent event) {
 					PacketFilterManager.this.onPluginDisabled(event, plugin);
 				}
 
-			}, plugin);
-
-		} catch (NoSuchMethodError e) {
-			// Oh wow! We're running on 1.0.0 or older.
-			registerOld(manager, plugin);
-		}
+		}, plugin);
 	}
 
     private void onPlayerLogin(PlayerLoginEvent event) {
@@ -1132,113 +1105,6 @@ public final class PacketFilterManager implements ListenerInvoker, InternalManag
 		return PacketRegistry.getPacketClassFromID(packetID, forceVanilla);
 	}
 
-	// Yes, this is crazy.
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private void registerOld(PluginManager manager, final Plugin plugin) {
-		try {
-			ClassLoader loader = manager.getClass().getClassLoader();
-
-			// The different enums we are going to need
-			Class eventTypes = loader.loadClass("org.bukkit.event.Event$Type");
-			Class eventPriority = loader.loadClass("org.bukkit.event.Event$Priority");
-
-			// Get the priority
-			Object priorityLowest  = Enum.valueOf(eventPriority, "Lowest");
-			Object priorityMonitor = Enum.valueOf(eventPriority, "Monitor");
-
-			// Get event types
-			Object playerJoinType = Enum.valueOf(eventTypes, "PLAYER_JOIN");
-			Object playerQuitType = Enum.valueOf(eventTypes, "PLAYER_QUIT");
-			Object pluginDisabledType = Enum.valueOf(eventTypes, "PLUGIN_DISABLE");
-
-			// The player listener! Good times.
-			Class<?> playerListener = loader.loadClass("org.bukkit.event.player.PlayerListener");
-			Class<?> serverListener = loader.loadClass("org.bukkit.event.server.ServerListener");
-
-			// Find the register event method
-			Method registerEvent = FuzzyReflection.fromObject(manager).getMethodByParameters("registerEvent",
-					eventTypes, Listener.class, eventPriority, Plugin.class);
-
-			Enhancer playerLow = EnhancerFactory.getInstance().createEnhancer();
-			Enhancer playerEx = EnhancerFactory.getInstance().createEnhancer();
-			Enhancer serverEx = EnhancerFactory.getInstance().createEnhancer();
-
-			playerLow.setSuperclass(playerListener);
-			playerLow.setClassLoader(classLoader);
-			playerLow.setCallback(new MethodInterceptor() {
-				@Override
-				public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy)
-						throws Throwable {
-					// Must have a parameter
-					if (args.length == 1) {
-						Object event = args[0];
-
-						if (event instanceof PlayerJoinEvent) {
-							onPrePlayerJoin((PlayerJoinEvent) event);
-						}
-					}
-					return null;
-				}
-			});
-
-			playerEx.setSuperclass(playerListener);
-			playerEx.setClassLoader(classLoader);
-			playerEx.setCallback(new MethodInterceptor() {
-				@Override
-				public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
-					if (args.length == 1) {
-						Object event = args[0];
-
-						// Check for the correct event
-						if (event instanceof PlayerJoinEvent) {
-							onPlayerJoin((PlayerJoinEvent) event);
-						} else if (event instanceof PlayerQuitEvent) {
-							onPlayerQuit((PlayerQuitEvent) event);
-						}
-					}
-					return null;
-				}
-			});
-
-			serverEx.setSuperclass(serverListener);
-			serverEx.setClassLoader(classLoader);
-			serverEx.setCallback(new MethodInterceptor() {
-				@Override
-				public Object intercept(Object obj, Method method, Object[] args,
-						MethodProxy proxy) throws Throwable {
-					// Must have a parameter
-					if (args.length == 1) {
-						Object event = args[0];
-
-						if (event instanceof PluginDisableEvent)
-							onPluginDisabled((PluginDisableEvent) event, plugin);
-					}
-					return null;
-				}
-			});
-
-			// Create our listener
-			Object playerProxyLow = playerLow.create();
-			Object playerProxy = playerEx.create();
-			Object serverProxy = serverEx.create();
-
-			registerEvent.invoke(manager, playerJoinType, playerProxyLow, priorityLowest, plugin);
-			registerEvent.invoke(manager, playerJoinType, playerProxy, priorityMonitor, plugin);
-			registerEvent.invoke(manager, playerQuitType, playerProxy, priorityMonitor, plugin);
-			registerEvent.invoke(manager, pluginDisabledType, serverProxy, priorityMonitor, plugin);
-
-			// A lot can go wrong
-		} catch (ClassNotFoundException e1) {
-			e1.printStackTrace();
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-	}
-
 	/**
 	 * Retrieve every known and supported server packet.
 	 * @return An immutable set of every known server packet.

modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Metrics.java

@@ -27,34 +27,24 @@
  */
 package com.comphenix.protocol.metrics;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
 
+import com.comphenix.protocol.utility.Util;
+
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
-
-import com.comphenix.protocol.utility.Util;
-import com.comphenix.protocol.utility.WrappedScheduler;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 public class Metrics {
 
@@ -116,7 +106,7 @@ public class Metrics {
     /**
      * The scheduled task
      */
-    private volatile WrappedScheduler.TaskWrapper task = null;
+    private volatile BukkitTask task;
 
     public Metrics(final Plugin plugin) throws IOException {
         if (plugin == null) {
@@ -200,8 +190,7 @@ public class Metrics {
             }
 
             // Begin hitting the server with glorious data
-            task = WrappedScheduler.runAsynchronouslyRepeat(plugin, new Runnable() {
-
+            task = new BukkitRunnable() {
                 private boolean firstPost = true;
 
                 @Override
@@ -234,8 +223,7 @@ public class Metrics {
                         }
                     }
                 }
-            }, 0, PING_INTERVAL * 1200);
-
+            }.runTaskTimerAsynchronously(plugin, 0, PING_INTERVAL * 1200);
             return true;
         }
     }