Move listeners to respectful classes to be registered.

src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java

@@ -80,15 +80,6 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         if (getConfig().getBoolean("checkforupdates"))
             UpdateUtil.sendUpdateMessage(this);
 
-        Bukkit.getPluginManager().registerEvents(new Listener() {
-            @EventHandler
-            public void onPlayerQuit(PlayerQuitEvent e) {
-                removePortedClient(e.getPlayer().getUniqueId());
-            }
-        }, this);
-
-        Bukkit.getPluginManager().registerEvents(new ArmorListener(this), this);
-        Bukkit.getPluginManager().registerEvents(new CommandBlockListener(this), this);
         Bukkit.getPluginManager().registerEvents(new UpdateListener(this), this);
 
         getCommand("viaversion").setExecutor(new ViaVersionCommand(this));

src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java

@@ -4,11 +4,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import us.myles.ViaVersion.CancelException;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.packets.Direction;
 import us.myles.ViaVersion.packets.State;
-import us.myles.ViaVersion.api.Pair;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +19,11 @@ public abstract class Protocol {
 
     public Protocol() {
         registerPackets();
+        registerListeners();
+    }
+
+    protected void registerListeners() {
+
     }
 
     protected abstract void registerPackets();

src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java

@@ -1,10 +1,15 @@
 package us.myles.ViaVersion.protocols.base;
 
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.protocol.Protocol;
@@ -14,7 +19,6 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
-import us.myles.ViaVersion.api.Pair;
 
 import java.util.List;
 import java.util.UUID;
@@ -143,4 +147,15 @@ public class BaseProtocol extends Protocol {
     public void init(UserConnection userConnection) {
         // Nothing gets added, ProtocolPipeline handles ProtocolInfo
     }
+
+    @Override
+    protected void registerListeners() {
+        final ViaVersionPlugin plugin = (ViaVersionPlugin) Bukkit.getPluginManager().getPlugin("ViaVersion");
+        Bukkit.getPluginManager().registerEvents(new Listener() {
+            @EventHandler
+            public void onPlayerQuit(PlayerQuitEvent e) {
+                plugin.removePortedClient(e.getPlayer().getUniqueId());
+            }
+        }, plugin);
+    }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java

@@ -5,6 +5,8 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
+import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
@@ -13,6 +15,8 @@ import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.ArmorListener;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.CommandBlockListener;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.packets.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
@@ -88,6 +92,13 @@ public class Protocol1_9TO1_8 extends Protocol {
         WorldPackets.register(this);
     }
 
+    @Override
+    protected void registerListeners() {
+        ViaVersionPlugin plugin = (ViaVersionPlugin) Bukkit.getPluginManager().getPlugin("ViaVersion");
+        Bukkit.getPluginManager().registerEvents(new ArmorListener(plugin), plugin);
+        Bukkit.getPluginManager().registerEvents(new CommandBlockListener(plugin), plugin);
+    }
+
     @Override
     public void init(UserConnection userConnection) {
         // Entity tracker