Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2025-01-03 23:18:05 +01:00
Code Issues Projects Releases Wiki Activity

The serializer can be null

Browse Source 
But this will cause issues when trying to register objects
This commit is contained in:
Dan Mulloy 2016-03-05 23:53:55 -05:00
parent 11ba322b5f
commit 7077037bb7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,9 +542,9 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
}
/**
* Gets this watcher object's serializer.
* Gets this watcher object's serializer. Will return null if the serializer was never specified.
*
* @return The serializer
* @return The serializer, or null
*/
public Serializer getSerializer() {
if (getSerializer == null) {
@ -553,12 +553,15 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
}
Object serializer = getSerializer.invoke(handle);
Serializer wrapper = Registry.fromHandle(serializer);
if (wrapper != null) {
return wrapper;
if (serializer != null) {
Serializer wrapper = Registry.fromHandle(serializer);
if (wrapper != null) {
return wrapper;
} else {
return new Serializer(null, serializer, false);
}
} else {
return new Serializer(null, serializer, false);
return null;
}
}