Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NullPointerException

This commit is contained in:
filoghost 2021-12-26 16:36:44 +01:00
parent ae7591f952
commit 243bf9ea0a
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/DataWatcherPacketBuilder.java
View File

@ -31,6 +31,9 @@ abstract class DataWatcherPacketBuilder<T> {
}
DataWatcherPacketBuilder<T> setCustomName(String customName) {
if (customName == null) {
customName = "";
}
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this;

3
nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/DataWatcherPacketBuilder.java
View File

@ -30,6 +30,9 @@ abstract class DataWatcherPacketBuilder<T> {
}
DataWatcherPacketBuilder<T> setCustomName(String customName) {
if (customName == null) {
customName = "";
}
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this;

3
nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/DataWatcherPacketBuilder.java
View File

@ -30,6 +30,9 @@ abstract class DataWatcherPacketBuilder<T> {
}
DataWatcherPacketBuilder<T> setCustomName(String customName) {
if (customName == null) {
customName = "";
}
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this;

3
nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/DataWatcherPacketBuilder.java
View File

@ -30,6 +30,9 @@ abstract class DataWatcherPacketBuilder<T> {
}
DataWatcherPacketBuilder<T> setCustomName(String customName) {
if (customName == null) {
customName = "";
}
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, Strings.isEmpty(customName) ? (byte) 0 : (byte) 1);
return this;

3
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/DataWatcherPacketBuilder.java
View File

@ -31,6 +31,9 @@ abstract class DataWatcherPacketBuilder<T> {
}
DataWatcherPacketBuilder<T> setCustomName(String customName) {
if (customName == null) {
customName = "";
}
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this;