From c0296f04a14049bd579870467dcb70872d2c2a5b Mon Sep 17 00:00:00 2001
From: Myles <mylescomputer@gmail.com>
Date: Mon, 29 Feb 2016 22:43:53 +0000
Subject: [PATCH] Allow sharing of protocol packet handler and be more verbose
 to do with metaindex data

---
 .../handlers/ViaOutboundPacketHandler.java    |  6 +--
 .../transformers/OutgoingTransformer.java     | 42 +++++++++++++------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/main/java/us/myles/ViaVersion/handlers/ViaOutboundPacketHandler.java b/src/main/java/us/myles/ViaVersion/handlers/ViaOutboundPacketHandler.java
index 817731e67..29f6b889d 100644
--- a/src/main/java/us/myles/ViaVersion/handlers/ViaOutboundPacketHandler.java
+++ b/src/main/java/us/myles/ViaVersion/handlers/ViaOutboundPacketHandler.java
@@ -1,15 +1,13 @@
 package us.myles.ViaVersion.handlers;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOutboundHandlerAdapter;
-import io.netty.channel.ChannelPromise;
+import io.netty.channel.*;
 import us.myles.ViaVersion.ConnectionInfo;
 import us.myles.ViaVersion.ReflectionUtil;
 
 import java.lang.reflect.Constructor;
 
+@ChannelHandler.Sharable
 public class ViaOutboundPacketHandler extends ChannelOutboundHandlerAdapter {
     private final ConnectionInfo info;
 
diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
index 412646869..8ec3679c7 100644
--- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
+++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
@@ -327,12 +327,12 @@ public class OutgoingTransformer {
             output.writeBytes(input);
             return;
         }
-        if(packet == PacketType.PLAY_TEAM) {
+        if (packet == PacketType.PLAY_TEAM) {
             String teamName = PacketUtil.readString(input);
             PacketUtil.writeString(teamName, output);
             byte mode = input.readByte();
             output.writeByte(mode);
-            if(mode == 0 || mode == 2){
+            if (mode == 0 || mode == 2) {
                 PacketUtil.writeString(PacketUtil.readString(input), output);
                 PacketUtil.writeString(PacketUtil.readString(input), output);
                 PacketUtil.writeString(PacketUtil.readString(input), output);
@@ -420,15 +420,24 @@ public class OutgoingTransformer {
     }
 
     private void transformMetadata(Entity entity, List dw, ByteBuf output) {
-        try {
-            if (dw != null) {
-                short id = -1;
-                int data = -1;
+        if (dw != null) {
+            short id = -1;
+            int data = -1;
 
-                Iterator iterator = dw.iterator();
-                while (iterator.hasNext()) {
-                    Object watchableObj = iterator.next(); //
-                    MetaIndex metaIndex = MetaIndex.getIndex(entity, (int) ReflectionUtil.invoke(watchableObj, "a"));
+            Iterator iterator = dw.iterator();
+            while (iterator.hasNext()) {
+                Object watchableObj = iterator.next(); //
+                MetaIndex metaIndex = null;
+                try {
+                    metaIndex = MetaIndex.getIndex(entity, (int) ReflectionUtil.invoke(watchableObj, "a"));
+                } catch (NoSuchMethodException e) {
+                    e.printStackTrace();
+                } catch (InvocationTargetException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                try {
                     if (metaIndex.getNewType() != NewType.Discontinued) {
                         if (metaIndex.getNewType() != NewType.BlockID || id != -1 && data == -1 || id == -1 && data != -1) { // block ID is only written if we have both parts
                             output.writeByte(metaIndex.getNewIndex());
@@ -507,13 +516,20 @@ public class OutgoingTransformer {
                                 output.writeFloat((float) ReflectionUtil.invoke(value, "getY"));
                                 output.writeFloat((float) ReflectionUtil.invoke(value, "getZ"));
                         }
+
                     }
+                } catch (Exception e) {
+                    if (entity != null) {
+                        System.out.println("An error occurred with entity meta data for " + entity.getType());
+                        System.out.println("Old ID: " + metaIndex.getIndex() + " New ID: " + metaIndex.getNewIndex());
+                        System.out.println("Old Type: " + metaIndex.getOldType() + " New Type: " + metaIndex.getNewType());
+                    }
+                    e.printStackTrace();
                 }
             }
-            output.writeByte(255);
-        }catch(Exception e){
-            e.printStackTrace();
         }
+        output.writeByte(255);
+
 
     }