Jona123
/
NPCLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code for 2.4.2-SNAPSHOT.

This commit is contained in:
Jitse Boonstra 2020-04-11 20:51:05 +02:00
parent e47dbc51d0
commit 8e661b024e
27 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<artifactId>npclib</artifactId> <artifactId>npclib</artifactId>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-api</artifactId> <artifactId>npclib-api</artifactId>

3
api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java
View File

@ -150,7 +150,7 @@ public abstract class TinyProtocol {
private void registerBukkitEvents() { private void registerBukkitEvents() {
listener = new Listener() { listener = new Listener() {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.MONITOR)
public final void onPlayerLogin(PlayerLoginEvent e) { public final void onPlayerLogin(PlayerLoginEvent e) {
if (closed) if (closed)
return; return;
@ -248,7 +248,6 @@ public abstract class TinyProtocol {
channel.pipeline().addBefore("packet_handler", handlerName, interceptor); channel.pipeline().addBefore("packet_handler", handlerName, interceptor);
uninjectedChannels.remove(channel); uninjectedChannels.remove(channel);
} }
return interceptor; return interceptor;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
// Try again // Try again

2
nms/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib</artifactId> <artifactId>npclib</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>

2
nms/v1_10_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_10_R1</artifactId> <artifactId>npclib-nms-v1_10_R1</artifactId>

3
nms/v1_10_R1/src/main/java/net/jitse/npclib/nms/v1_10_R1/NPC_v1_10_R1.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_10_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_11_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_11_R1</artifactId> <artifactId>npclib-nms-v1_11_R1</artifactId>

3
nms/v1_11_R1/src/main/java/net/jitse/npclib/nms/v1_11_R1/NPC_v1_11_R1.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_11_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_12_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_12_R1</artifactId> <artifactId>npclib-nms-v1_12_R1</artifactId>

3
nms/v1_12_R1/src/main/java/net/jitse/npclib/nms/v1_12_R1/NPC_v1_12_R1.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_12_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_13_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_13_R1</artifactId> <artifactId>npclib-nms-v1_13_R1</artifactId>

3
nms/v1_13_R1/src/main/java/net/jitse/npclib/nms/v1_13_R1/NPC_v1_13_R1.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_13_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_13_R2/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_13_R2</artifactId> <artifactId>npclib-nms-v1_13_R2</artifactId>

3
nms/v1_13_R2/src/main/java/net/jitse/npclib/nms/v1_13_R2/NPC_v1_13_R2.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_13_R2 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_14_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_14_R1</artifactId> <artifactId>npclib-nms-v1_14_R1</artifactId>

3
nms/v1_14_R1/src/main/java/net/jitse/npclib/nms/v1_14_R1/NPC_v1_14_R1.java
View File

@ -68,8 +68,9 @@ public class NPC_v1_14_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_15_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_15_R1</artifactId> <artifactId>npclib-nms-v1_15_R1</artifactId>

3
nms/v1_15_R1/src/main/java/net/jitse/npclib/nms/v1_15_R1/NPC_v1_15_R1.java
View File

@ -69,8 +69,9 @@ public class NPC_v1_15_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_8_R2/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_8_R2</artifactId> <artifactId>npclib-nms-v1_8_R2</artifactId>

3
nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_8_R2 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_8_R3/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_8_R3</artifactId> <artifactId>npclib-nms-v1_8_R3</artifactId>

3
nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_8_R3 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_9_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_9_R1</artifactId> <artifactId>npclib-nms-v1_9_R1</artifactId>

3
nms/v1_9_R1/src/main/java/net/jitse/npclib/nms/v1_9_R1/NPC_v1_9_R1.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_9_R1 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
nms/v1_9_R2/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib-nms</artifactId> <artifactId>npclib-nms</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-nms-v1_9_R2</artifactId> <artifactId>npclib-nms-v1_9_R2</artifactId>

3
nms/v1_9_R2/src/main/java/net/jitse/npclib/nms/v1_9_R2/NPC_v1_9_R2.java
View File

@ -72,8 +72,9 @@ public class NPC_v1_9_R2 extends NPCBase {
hologram.show(player); hologram.show(player);
// Removing the player info after 10 seconds.
Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () -> Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 50); playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
} }
@Override @Override

2
plugin/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib</artifactId> <artifactId>npclib</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>npclib-plugin</artifactId> <artifactId>npclib-plugin</artifactId>

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>net.jitse</groupId> <groupId>net.jitse</groupId>
<artifactId>npclib</artifactId> <artifactId>npclib</artifactId>
<version>2.4.1-SNAPSHOT</version> <version>2.4.2-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>