Bukkit - Use the other constructor for player info packet which is cl…

…eaner (also #797)
NEZNAMY · Jan 20, 2023 · 189797a · 189797a
1 parent 1ae2ef7
commit 189797a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitPacketBuilder.java b/bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitPacketBuilder.java
@@ -12,10 +12,12 @@
 import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.EnumGamemode;
 import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
 import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.PlayerInfoData;
-import me.neznamy.tab.platforms.bukkit.nms.*;
+import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityDestroy;
+import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityMetadata;
+import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityTeleport;
+import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutSpawnEntityLiving;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
 import me.neznamy.tab.platforms.bukkit.nms.storage.NMSStorage;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 
@@ -100,7 +102,7 @@ public Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersio
                 );
             }
             Enum[] array = packet.getActions().stream().map(action -> Enum.valueOf(nms.EnumPlayerInfoAction, action.toString())).toArray(Enum[]::new);
-            Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(array[0], nms.getHandle.invoke(Bukkit.getOnlinePlayers().iterator().next()));
+            Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(EnumSet.of(array[0], array), Collections.emptyList());
             List<Object> items = new ArrayList<>();
             for (PlayerInfoData data : packet.getEntries()) {
                 GameProfile profile = new GameProfile(data.getUniqueId(), data.getName());
@@ -116,7 +118,6 @@ public Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersio
                         data.getProfilePublicKey() == null ? null : nms.newRemoteChatSession$Data.newInstance(data.getChatSessionId(), data.getProfilePublicKey()));
                 items.add(obj);
             }
-            nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_ACTION, EnumSet.of(array[0], array));
             nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_PLAYERS, items);
             return nmsPacket;
         } else {

diff --git a/bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/storage/NMSStorage.java b/bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/storage/NMSStorage.java
@@ -312,7 +312,7 @@ protected void playerInfo() throws ReflectiveOperationException {
         if (minorVersion < 8) return;
         if (is1_19_3Plus()) {
             newClientboundPlayerInfoRemovePacket = ClientboundPlayerInfoRemovePacket.getConstructor(List.class);
-            newPacketPlayOutPlayerInfo = PacketPlayOutPlayerInfo.getConstructor(EnumPlayerInfoAction, EntityPlayer);
+            newPacketPlayOutPlayerInfo = PacketPlayOutPlayerInfo.getConstructor(EnumSet.class, Collection.class);
             ClientboundPlayerInfoRemovePacket_getEntries = getMethods(ClientboundPlayerInfoRemovePacket, List.class).get(0);
             PacketPlayOutPlayerInfo_ACTION = getFields(PacketPlayOutPlayerInfo, EnumSet.class).get(0);
             newRemoteChatSession$Data = RemoteChatSession$Data.getConstructor(UUID.class, ProfilePublicKey$a);