From eb150bf1606d1a1c36d0af75acef6c0a31f789d9 Mon Sep 17 00:00:00 2001 From: JitseB Date: Mon, 23 Apr 2018 13:34:35 +0200 Subject: [PATCH 1/3] Trying to figure out a custom skin rendering issue. --- src/net/jitse/npclib/listeners/PacketListener.java | 2 ++ src/net/jitse/npclib/nms/v1_12_R1/NPC_V1_12_R1.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/net/jitse/npclib/listeners/PacketListener.java b/src/net/jitse/npclib/listeners/PacketListener.java index 1deb175..8cacbd9 100644 --- a/src/net/jitse/npclib/listeners/PacketListener.java +++ b/src/net/jitse/npclib/listeners/PacketListener.java @@ -39,6 +39,8 @@ public class PacketListener { @Override public Object onPacketInAsync(Player player, Channel channel, Object packet) { + // Todo: Remove this debug message. + Bukkit.broadcastMessage("Class:" + packet.getClass().getName()); if (packetPlayInUseEntityClazz.isInstance(packet)) { NPC npc = NPCManager.getAllNPCs().stream().filter( diff --git a/src/net/jitse/npclib/nms/v1_12_R1/NPC_V1_12_R1.java b/src/net/jitse/npclib/nms/v1_12_R1/NPC_V1_12_R1.java index ace0d82..154b40c 100644 --- a/src/net/jitse/npclib/nms/v1_12_R1/NPC_V1_12_R1.java +++ b/src/net/jitse/npclib/nms/v1_12_R1/NPC_V1_12_R1.java @@ -82,9 +82,9 @@ public class NPC_V1_12_R1 extends NPC { hologram.spawn(player); - + // Todo: Test this new delay speed (custom skin render issue). Bukkit.getScheduler().runTaskLater(plugin, () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 5); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 10); } @Override From f4d907c1a56843a15f4296d2beec29e5e1508169 Mon Sep 17 00:00:00 2001 From: JitseB Date: Wed, 25 Apr 2018 15:23:47 +0200 Subject: [PATCH 2/3] Working on updates. --- src/net/jitse/npclib/listeners/PacketListener.java | 3 --- .../packets/PacketPlayOutEntityTeleportWrapper.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutEntityTeleportWrapper.java diff --git a/src/net/jitse/npclib/listeners/PacketListener.java b/src/net/jitse/npclib/listeners/PacketListener.java index 8cacbd9..ac7729e 100644 --- a/src/net/jitse/npclib/listeners/PacketListener.java +++ b/src/net/jitse/npclib/listeners/PacketListener.java @@ -39,9 +39,6 @@ public class PacketListener { @Override public Object onPacketInAsync(Player player, Channel channel, Object packet) { - // Todo: Remove this debug message. - Bukkit.broadcastMessage("Class:" + packet.getClass().getName()); - if (packetPlayInUseEntityClazz.isInstance(packet)) { NPC npc = NPCManager.getAllNPCs().stream().filter( check -> check.isActuallyShown(player) && check.getEntityId() == (int) entityIdField.get(packet)) diff --git a/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutEntityTeleportWrapper.java b/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutEntityTeleportWrapper.java new file mode 100644 index 0000000..7624b2e --- /dev/null +++ b/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutEntityTeleportWrapper.java @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2018 Jitse Boonstra + */ + +package net.jitse.npclib.nms.v1_12_R1.packets; + +/** + * @author Jitse Boonstra + */ +public class PacketPlayOutEntityTeleportWrapper { + + +} From d77f21827e0895f3031ce7110491006e9b644433 Mon Sep 17 00:00:00 2001 From: JitseB Date: Wed, 25 Apr 2018 15:53:07 +0200 Subject: [PATCH 3/3] Started ripping apart the (bigger) player listener class. --- .../npclib/listeners/PlayerListener.java | 15 --------- .../listeners/player/PlayerQuitListener.java | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 src/net/jitse/npclib/listeners/player/PlayerQuitListener.java diff --git a/src/net/jitse/npclib/listeners/PlayerListener.java b/src/net/jitse/npclib/listeners/PlayerListener.java index 29e9f15..671071d 100644 --- a/src/net/jitse/npclib/listeners/PlayerListener.java +++ b/src/net/jitse/npclib/listeners/PlayerListener.java @@ -12,7 +12,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerTeleportEvent; /** @@ -20,20 +19,6 @@ import org.bukkit.event.player.PlayerTeleportEvent; */ public class PlayerListener implements Listener { - @EventHandler - public void onPlayerQuit(PlayerQuitEvent event) { - Player player = event.getPlayer(); - for (NPC npc : NPCManager.getAllNPCs()) { - if (npc.getAutoHidden().contains(player.getUniqueId())) { - npc.getAutoHidden().remove(player.getUniqueId()); - } - - if (npc.isActuallyShown(player)) { - npc.hide(player); - } - } - } - @EventHandler public void onPlayerMove(PlayerMoveEvent event) { Location from = event.getFrom(); diff --git a/src/net/jitse/npclib/listeners/player/PlayerQuitListener.java b/src/net/jitse/npclib/listeners/player/PlayerQuitListener.java new file mode 100644 index 0000000..becb046 --- /dev/null +++ b/src/net/jitse/npclib/listeners/player/PlayerQuitListener.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2018 Jitse Boonstra + */ + +package net.jitse.npclib.listeners.player; + +import net.jitse.npclib.NPCManager; +import net.jitse.npclib.api.NPC; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerQuitEvent; + +/** + * @author Jitse Boonstra + */ +public class PlayerQuitListener implements Listener { + + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + Player player = event.getPlayer(); + for (NPC npc : NPCManager.getAllNPCs()) { + if (npc.getAutoHidden().contains(player.getUniqueId())) { + npc.getAutoHidden().remove(player.getUniqueId()); + } + + if (npc.isActuallyShown(player)) { + npc.hide(player); + } + } + } +}