Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-24 03:25:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix a few errors with data watchers

Browse Source 
This is why we have unit tests lol
This commit is contained in:
Dan Mulloy 2016-03-03 21:27:05 -05:00
parent a20ff4645d
commit 9b838df17d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
View File

@ -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);
}