Skip to content

Commit 91707cb

Browse files
committed
Hotfix holograms
1 parent bf5f1f1 commit 91707cb

7 files changed

Lines changed: 14 additions & 7 deletions

File tree

  • nms
    • v1_18_R1/src/main/java/com/artillexstudios/axapi/nms/v1_18_R1/entity
    • v1_18_R2/src/main/java/com/artillexstudios/axapi/nms/v1_18_R2/entity
    • v1_19_R1/src/main/java/com/artillexstudios/axapi/nms/v1_19_R1/entity
    • v1_19_R2/src/main/java/com/artillexstudios/axapi/nms/v1_19_R2/entity
    • v1_19_R3/src/main/java/com/artillexstudios/axapi/nms/v1_19_R3/entity
    • v1_20_R1/src/main/java/com/artillexstudios/axapi/nms/v1_20_R1/entity
    • v1_20_R2/src/main/java/com/artillexstudios/axapi/nms/v1_20_R2/entity

nms/v1_18_R1/src/main/java/com/artillexstudios/axapi/nms/v1_18_R1/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
5959
public EntityTracker.TrackedEntity tracker;
6060
private List<SynchedEntityData.DataItem<?>> trackedValues;
6161
private Location location;
62-
private Component name = null;
62+
private Component name = Component.empty();
6363
private int viewDistance = 32;
6464
private int viewDistanceSquared = 32 * 32;
6565
private boolean itemDirty = false;
@@ -138,6 +138,7 @@ public Component getName() {
138138
@Override
139139
public void setName(Component name) {
140140
if (name == null) {
141+
this.name = Component.empty();
141142
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
142143
data.set(EntityData.CUSTOM_NAME, Optional.empty());
143144
return;

nms/v1_18_R2/src/main/java/com/artillexstudios/axapi/nms/v1_18_R2/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
5858
public EntityTracker.TrackedEntity tracker;
5959
private List<SynchedEntityData.DataItem<?>> trackedValues;
6060
private Location location;
61-
private Component name = null;
61+
private Component name = Component.empty();
6262
private int viewDistance = 32;
6363
private int viewDistanceSquared = 32 * 32;
6464
private boolean itemDirty = false;
@@ -137,6 +137,7 @@ public Component getName() {
137137
@Override
138138
public void setName(Component name) {
139139
if (name == null) {
140+
this.name = Component.empty();
140141
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
141142
data.set(EntityData.CUSTOM_NAME, Optional.empty());
142143
return;

nms/v1_19_R1/src/main/java/com/artillexstudios/axapi/nms/v1_19_R1/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
5858
public EntityTracker.TrackedEntity tracker;
5959
private List<SynchedEntityData.DataItem<?>> trackedValues;
6060
private Location location;
61-
private Component name = null;
61+
private Component name = Component.empty();
6262
private int viewDistance = 32;
6363
private int viewDistanceSquared = 32 * 32;
6464
private boolean itemDirty = false;
@@ -137,6 +137,7 @@ public Component getName() {
137137
@Override
138138
public void setName(Component name) {
139139
if (name == null) {
140+
this.name = Component.empty();
140141
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
141142
data.set(EntityData.CUSTOM_NAME, Optional.empty());
142143
return;

nms/v1_19_R2/src/main/java/com/artillexstudios/axapi/nms/v1_19_R2/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
5858
public EntityTracker.TrackedEntity tracker;
5959
private List<SynchedEntityData.DataValue<?>> trackedValues;
6060
private Location location;
61-
private Component name = null;
61+
private Component name = Component.empty();
6262
private int viewDistance = 32;
6363
private int viewDistanceSquared = 32 * 32;
6464
private boolean itemDirty = false;
@@ -137,6 +137,7 @@ public Component getName() {
137137
@Override
138138
public void setName(Component name) {
139139
if (name == null) {
140+
this.name = Component.empty();
140141
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
141142
data.set(EntityData.CUSTOM_NAME, Optional.empty());
142143
return;

nms/v1_19_R3/src/main/java/com/artillexstudios/axapi/nms/v1_19_R3/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
5959
public EntityTracker.TrackedEntity tracker;
6060
private List<SynchedEntityData.DataValue<?>> trackedValues;
6161
private Location location;
62-
private Component name = null;
62+
private Component name = Component.empty();
6363
private int viewDistance = 32;
6464
private int viewDistanceSquared = 32 * 32;
6565
private boolean itemDirty = false;
@@ -138,6 +138,7 @@ public Component getName() {
138138
@Override
139139
public void setName(Component name) {
140140
if (name == null) {
141+
this.name = Component.empty();
141142
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
142143
data.set(EntityData.CUSTOM_NAME, Optional.empty());
143144
return;

nms/v1_20_R1/src/main/java/com/artillexstudios/axapi/nms/v1_20_R1/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
6060
public EntityTracker.TrackedEntity tracker;
6161
private List<SynchedEntityData.DataValue<?>> trackedValues;
6262
private Location location;
63-
private Component name = null;
63+
private Component name = Component.empty();
6464
private int viewDistance = 32;
6565
private int viewDistanceSquared = 32 * 32;
6666
private boolean itemDirty = false;
@@ -139,6 +139,7 @@ public Component getName() {
139139
@Override
140140
public void setName(Component name) {
141141
if (name == null) {
142+
this.name = Component.empty();
142143
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
143144
data.set(EntityData.CUSTOM_NAME, Optional.empty());
144145
return;

nms/v1_20_R2/src/main/java/com/artillexstudios/axapi/nms/v1_20_R2/entity/PacketEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class PacketEntity implements com.artillexstudios.axapi.entity.impl.Packe
5959
public EntityTracker.TrackedEntity tracker;
6060
private List<SynchedEntityData.DataValue<?>> trackedValues;
6161
private Location location;
62-
private Component name = null;
62+
private Component name = Component.empty();
6363
private int viewDistance = 32;
6464
private int viewDistanceSquared = 32 * 32;
6565
private boolean itemDirty = false;
@@ -138,6 +138,7 @@ public Component getName() {
138138
@Override
139139
public void setName(Component name) {
140140
if (name == null) {
141+
this.name = Component.empty();
141142
data.set(EntityData.CUSTOM_NAME_VISIBLE, false);
142143
data.set(EntityData.CUSTOM_NAME, Optional.empty());
143144
return;

0 commit comments

Comments
 (0)