This commit is contained in:
Gatt
2020-07-16 22:17:20 +10:00
parent 4da537e978
commit 75f680c480
13 changed files with 16 additions and 16 deletions
@@ -45,7 +45,8 @@ public abstract class NPCBase implements NPC, NPCPacketHandler {
protected List<String> text; protected List<String> text;
protected Location location; protected Location location;
protected Skin skin; protected Skin skin;
protected Hologram hologram;
//protected Hologram hologram;
protected final Map<NPCSlot, ItemStack> items = new EnumMap<>(NPCSlot.class); protected final Map<NPCSlot, ItemStack> items = new EnumMap<>(NPCSlot.class);
@@ -90,7 +91,6 @@ public abstract class NPCBase implements NPC, NPCPacketHandler {
Hologram hologram = getPlayerHologram(targetPlayer); // Hologram hologram = getPlayerHologram(targetPlayer); //
List<Object> updatePackets = hologram.getUpdatePackets(getPlayerLines(targetPlayer)); List<Object> updatePackets = hologram.getUpdatePackets(getPlayerLines(targetPlayer));
hologram.update(targetPlayer, updatePackets); hologram.update(targetPlayer, updatePackets);
hologram.show(targetPlayer);
} }
return this; return this;
} }
@@ -348,8 +348,8 @@ public abstract class NPCBase implements NPC, NPCPacketHandler {
for (UUID shownUuid : shown) { for (UUID shownUuid : shown) {
Player player = Bukkit.getPlayer(shownUuid); Player player = Bukkit.getPlayer(shownUuid);
if (player != null && isShown(player)) { if (player != null && isShown(player)) {
Hologram originalhologram = getPlayerHologram(player); Hologram originalHologram = getPlayerHologram(player);
originalhologram.hide(player); // essentially destroy the hologram originalHologram.hide(player); // essentially destroy the hologram
textDisplayHolograms.remove(player.getUniqueId()); // remove the old obj textDisplayHolograms.remove(player.getUniqueId()); // remove the old obj
Hologram hologram = getPlayerHologram(player); // let it regenerate Hologram hologram = getPlayerHologram(player); // let it regenerate
List<Object> updatePackets = hologram.getUpdatePackets(getPlayerLines(player)); List<Object> updatePackets = hologram.getUpdatePackets(getPlayerLines(player));
@@ -103,7 +103,7 @@ public class NPC_v1_10_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -103,7 +103,7 @@ public class NPC_v1_11_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -103,7 +103,7 @@ public class NPC_v1_12_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -103,7 +103,7 @@ public class NPC_v1_13_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -102,7 +102,7 @@ public class NPC_v1_13_R2 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -98,7 +98,7 @@ public class NPC_v1_14_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -99,7 +99,7 @@ public class NPC_v1_15_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -102,7 +102,7 @@ public class NPC_v1_16_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -103,7 +103,7 @@ public class NPC_v1_8_R2 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -102,7 +102,7 @@ public class NPC_v1_8_R3 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -103,7 +103,7 @@ public class NPC_v1_9_R1 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override
@@ -104,7 +104,7 @@ public class NPC_v1_9_R2 extends NPCBase {
playerConnection.sendPacket(packetPlayOutEntityDestroy); playerConnection.sendPacket(packetPlayOutEntityDestroy);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
hologram.hide(player); getPlayerHologram(player).hide(player);
} }
@Override @Override