diff --git a/api/pom.xml b/api/pom.xml index 44c77e1..45cec94 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -8,7 +8,7 @@ npclib net.jitse - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-api diff --git a/api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java b/api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java index f9b4f71..04fdb02 100644 --- a/api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java +++ b/api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java @@ -150,7 +150,7 @@ public abstract class TinyProtocol { private void registerBukkitEvents() { listener = new Listener() { - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler(priority = EventPriority.MONITOR) public final void onPlayerLogin(PlayerLoginEvent e) { if (closed) return; @@ -248,7 +248,6 @@ public abstract class TinyProtocol { channel.pipeline().addBefore("packet_handler", handlerName, interceptor); uninjectedChannels.remove(channel); } - return interceptor; } catch (IllegalArgumentException e) { // Try again diff --git a/nms/pom.xml b/nms/pom.xml index cb469e6..6009070 100644 --- a/nms/pom.xml +++ b/nms/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms diff --git a/nms/v1_10_R1/pom.xml b/nms/v1_10_R1/pom.xml index d7ec0c3..72f34db 100755 --- a/nms/v1_10_R1/pom.xml +++ b/nms/v1_10_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_10_R1 diff --git a/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/NPC_v1_10_R1.java b/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/NPC_v1_10_R1.java index 44db5d6..58382f9 100755 --- a/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/NPC_v1_10_R1.java +++ b/nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/NPC_v1_10_R1.java @@ -72,8 +72,9 @@ public class NPC_v1_10_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_11_R1/pom.xml b/nms/v1_11_R1/pom.xml index 0c32e92..35f571d 100755 --- a/nms/v1_11_R1/pom.xml +++ b/nms/v1_11_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_11_R1 diff --git a/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/NPC_v1_11_R1.java b/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/NPC_v1_11_R1.java index 4cfe127..de491a5 100755 --- a/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/NPC_v1_11_R1.java +++ b/nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/NPC_v1_11_R1.java @@ -72,8 +72,9 @@ public class NPC_v1_11_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_12_R1/pom.xml b/nms/v1_12_R1/pom.xml index 7ebbaf6..4c17ae7 100755 --- a/nms/v1_12_R1/pom.xml +++ b/nms/v1_12_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_12_R1 diff --git a/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/NPC_v1_12_R1.java b/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/NPC_v1_12_R1.java index 1a611ea..64350da 100755 --- a/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/NPC_v1_12_R1.java +++ b/nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/NPC_v1_12_R1.java @@ -72,8 +72,9 @@ public class NPC_v1_12_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_13_R1/pom.xml b/nms/v1_13_R1/pom.xml index 4f1991b..5d3e4ca 100755 --- a/nms/v1_13_R1/pom.xml +++ b/nms/v1_13_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_13_R1 diff --git a/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/NPC_v1_13_R1.java b/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/NPC_v1_13_R1.java index a942f72..0706ba4 100755 --- a/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/NPC_v1_13_R1.java +++ b/nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/NPC_v1_13_R1.java @@ -72,8 +72,9 @@ public class NPC_v1_13_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_13_R2/pom.xml b/nms/v1_13_R2/pom.xml index 56fd8cd..61f707d 100755 --- a/nms/v1_13_R2/pom.xml +++ b/nms/v1_13_R2/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_13_R2 diff --git a/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/NPC_v1_13_R2.java b/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/NPC_v1_13_R2.java index 5dfca45..dc71cdb 100755 --- a/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/NPC_v1_13_R2.java +++ b/nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/NPC_v1_13_R2.java @@ -72,8 +72,9 @@ public class NPC_v1_13_R2 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_14_R1/pom.xml b/nms/v1_14_R1/pom.xml index 7649a19..9c2dc1f 100755 --- a/nms/v1_14_R1/pom.xml +++ b/nms/v1_14_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_14_R1 diff --git a/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/NPC_v1_14_R1.java b/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/NPC_v1_14_R1.java index 98d5909..f3eb2bc 100755 --- a/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/NPC_v1_14_R1.java +++ b/nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/NPC_v1_14_R1.java @@ -68,8 +68,9 @@ public class NPC_v1_14_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_15_R1/pom.xml b/nms/v1_15_R1/pom.xml index f5ea2eb..6fe5267 100644 --- a/nms/v1_15_R1/pom.xml +++ b/nms/v1_15_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_15_R1 diff --git a/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/NPC_v1_15_R1.java b/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/NPC_v1_15_R1.java index 363d8bf..6afe00f 100644 --- a/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/NPC_v1_15_R1.java +++ b/nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/NPC_v1_15_R1.java @@ -69,8 +69,9 @@ public class NPC_v1_15_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_8_R2/pom.xml b/nms/v1_8_R2/pom.xml index a3ae75f..36f0496 100755 --- a/nms/v1_8_R2/pom.xml +++ b/nms/v1_8_R2/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_8_R2 diff --git a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java index b090c8a..8b3eabd 100755 --- a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java +++ b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java @@ -72,8 +72,9 @@ public class NPC_v1_8_R2 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_8_R3/pom.xml b/nms/v1_8_R3/pom.xml index 2796285..d04e6a7 100755 --- a/nms/v1_8_R3/pom.xml +++ b/nms/v1_8_R3/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_8_R3 diff --git a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java index c2dea9f..e961e3c 100755 --- a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java +++ b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java @@ -72,8 +72,9 @@ public class NPC_v1_8_R3 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_9_R1/pom.xml b/nms/v1_9_R1/pom.xml index ab0a49e..c99a7b6 100755 --- a/nms/v1_9_R1/pom.xml +++ b/nms/v1_9_R1/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_9_R1 diff --git a/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/NPC_v1_9_R1.java b/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/NPC_v1_9_R1.java index 437cbab..3447b75 100755 --- a/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/NPC_v1_9_R1.java +++ b/nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/NPC_v1_9_R1.java @@ -72,8 +72,9 @@ public class NPC_v1_9_R1 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/nms/v1_9_R2/pom.xml b/nms/v1_9_R2/pom.xml index b61dc11..590a908 100755 --- a/nms/v1_9_R2/pom.xml +++ b/nms/v1_9_R2/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib-nms - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-nms-v1_9_R2 diff --git a/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/NPC_v1_9_R2.java b/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/NPC_v1_9_R2.java index 7a49314..bc0fea6 100755 --- a/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/NPC_v1_9_R2.java +++ b/nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/NPC_v1_9_R2.java @@ -72,8 +72,9 @@ public class NPC_v1_9_R2 extends NPCBase { hologram.show(player); + // Removing the player info after 10 seconds. Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> - playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); + playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200); } @Override diff --git a/plugin/pom.xml b/plugin/pom.xml index 3cbbe75..5eb3040 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -8,7 +8,7 @@ net.jitse npclib - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT npclib-plugin diff --git a/pom.xml b/pom.xml index 205c7ec..dbf7d46 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ net.jitse npclib - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT UTF-8