From 9b838df17d9f5265f651a31dddad548d14c2a71b Mon Sep 17 00:00:00 2001
From: Dan Mulloy <dmulloy2@live.com>
Date: Thu, 3 Mar 2016 21:27:05 -0500
Subject: [PATCH] Fix a few errors with data watchers

This is why we have unit tests lol
---
 .../protocol/wrappers/WrappedDataWatcher.java          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
index e402ab44..2c463d5d 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
@@ -342,7 +342,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 	}
 
 	public static class WrappedDataWatcherObject extends AbstractWrapper {
-		private static final Class<?> HANDLE_TYPE = MinecraftReflection.getDataWatcherSerializerClass();
+		private static final Class<?> HANDLE_TYPE = MinecraftReflection.getDataWatcherObjectClass();
 		private static Constructor<?> constructor = null;
 
 		private StructureModifier<Object> modifier = new StructureModifier<Object>(HANDLE_TYPE);
@@ -354,16 +354,18 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 		}
 
 		public WrappedDataWatcherObject(int index, Serializer serializer) {
-			this(newHandle(index, serializer.getHandle()));
+			this(newHandle(index, serializer));
 		}
 
-		private static Object newHandle(int index, Object serializer) {
+		private static Object newHandle(int index, Serializer serializer) {
 			if (constructor == null) {
 				constructor = HANDLE_TYPE.getConstructors()[0];
 			}
 
+			Object handle = serializer != null ? serializer.getHandle() : null;
+
 			try {
-				return constructor.newInstance(index, serializer);
+				return constructor.newInstance(index, handle);
 			} catch (ReflectiveOperationException e) {
 				throw new RuntimeException("Failed to create new DataWatcherObject", e);
 			}