Fix for #147

Author: Jitse Boonstra

api/pom.xml

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

api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java

@@ -51,7 +51,7 @@ public abstract class TinyProtocol {
 
     // Speedup channel lookup
     // Made channelLookup UUID-based (JMB - 23rd Jan. 2021)
-    private Map<UUID, Channel> channelLookup = new MapMaker().weakValues().makeMap();
+    private Map<String, Channel> channelLookup = new MapMaker().weakValues().makeMap();
     private Listener listener;
 
     // Channels that have already been removed
@@ -162,29 +162,23 @@ private void registerBukkitEvents() {
 
             @EventHandler(priority = EventPriority.MONITOR)
             public final void onPlayerLogin(PlayerLoginEvent event) {
-                if (closed)
-                    return;
+                if (closed) return;
 
                 Channel channel = getChannel(event.getPlayer());
 
                 // Don't inject players that have been explicitly uninjected
-                if (!uninjectedChannels.contains(channel)) {
-                    injectPlayer(event.getPlayer());
-                }
+                if (!uninjectedChannels.contains(channel)) injectPlayer(event.getPlayer());
             }
 
             @EventHandler(priority = EventPriority.MONITOR)
             public final void onPlayerAsyncPreLogin(AsyncPlayerPreLoginEvent event) {
-                if (!injected) {
+                if (!injected)
                     event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "TinyProtocol not injected yet");
-                }
             }
 
             @EventHandler
             public final void onPluginDisable(PluginDisableEvent e) {
-                if (e.getPlugin().equals(plugin)) {
-                    close();
-                }
+                if (e.getPlugin().equals(plugin)) close();
             }
 
         };
@@ -273,14 +267,14 @@ private PacketInterceptor injectChannelInternal(Channel channel) {
     }
 
     private Channel getChannel(Player player) {
-        Channel channel = channelLookup.get(player.getUniqueId());
+        Channel channel = channelLookup.get(player.getName());
 
         // Lookup channel again
         if (channel == null) {
             Object connection = getConnection.get(getPlayerHandle.invoke(player));
             Object manager = getManager.get(connection);
 
-            channelLookup.put(player.getUniqueId(), channel = getChannel.get(manager));
+            channelLookup.put(player.getName(), channel = getChannel.get(manager));
         }
 
         return channel;
@@ -347,7 +341,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
         private void handleLoginStart(Channel channel, Object packet) {
             if (PACKET_LOGIN_IN_START.isInstance(packet)) {
                 GameProfile profile = getGameProfile.get(packet);
-                channelLookup.put(profile.getId(), channel);
+                channelLookup.put(profile.getName(), channel);
             }
         }
     }

api/src/main/java/net/jitse/npclib/hologram/Hologram.java

@@ -124,7 +124,7 @@ private void createPackets() {
 //                Reflection.getConstructor(ENTITY_ARMOR_STAND_CLASS, worldClass, double.class, double.class, double.class) :
 //                Reflection.getConstructor(ENTITY_ARMOR_STAND_CLASS, worldClass));
         // Replacement for issue #59
-        Reflection.ConstructorInvoker entityArmorStandConstructor = null;
+        Reflection.ConstructorInvoker entityArmorStandConstructor;
         try {
             entityArmorStandConstructor = (version.isAboveOrEqual(MinecraftVersion.V1_14_R1) ?
                     Reflection.getConstructor(ENTITY_ARMOR_STAND_CLASS, worldClass, double.class, double.class, double.class) :
@@ -158,7 +158,7 @@ private void createPackets() {
 
             if (SET_MARKER_METHOD != null) { // setMarker isn't a method in 1.8_R2, so still check if it exists in the first place.
                 Object bukkitEntity = GET_BUKKIT_ENTITY.invoke(entityArmorStand); // if it does, grab the Bukkit Entity
-                ArmorStand as = (ArmorStand)bukkitEntity; // reflection wasn't working here for some reason- just using a regular ArmorStand object since it's not version-dependent.
+                ArmorStand as = (ArmorStand) bukkitEntity; // reflection wasn't working here for some reason- just using a regular ArmorStand object since it's not version-dependent.
                 as.setMarker(true); // set the marker state
             }
 

nms/pom.xml

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

nms/v1_16_R2/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.12-SNAPSHOT</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_16_R2</artifactId>

nms/v1_16_R3/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.12-SNAPSHOT</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_16_R3</artifactId>

plugin/pom.xml

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

pom.xml

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