Merge pull request 'Fix RPlayer not showing when same player is present' (#71) from FixRPlayerHandling into main

Reviewed-on: SteamWar/SteamWar#71
Reviewed-by: D4rkr34lm <dark@steamwar.de>

SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java

@@ -19,18 +19,22 @@
 
 package de.steamwar.entity;
 
-import de.steamwar.Reflection;
 import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import de.steamwar.Reflection;
 import de.steamwar.core.BountifulWrapper;
 import de.steamwar.core.Core;
 import de.steamwar.core.FlatteningWrapper;
 import de.steamwar.core.ProtocolWrapper;
+import de.steamwar.network.NetworkSender;
+import de.steamwar.network.packets.common.PlayerSkinRequestPacket;
 import lombok.Getter;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -61,17 +65,40 @@ public class RPlayer extends REntity {
 
     private static final Object skinPartsDataWatcher = BountifulWrapper.impl.getDataWatcherObject(skinPartsIndex(), Byte.class);
 
+    private final UUID actualUUID;
     private final String name;
 
     public RPlayer(REntityServer server, UUID uuid, String name, Location location) {
-        super(server, EntityType.PLAYER, uuid, location,0);
+        super(server, EntityType.PLAYER, UUID.randomUUID(), location,0);
+        this.actualUUID = uuid;
         this.name = name;
         server.addEntity(this);
     }
 
+    public static final Map<UUID, Property> SKIN_DATA_PROMISES = new LinkedHashMap<UUID, Property>() {
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<UUID, Property> eldest) {
+            return size() > 100;
+        }
+    };
+
+    private GameProfile getGameProfile() {
+        Property skinData = SKIN_DATA_PROMISES.computeIfAbsent(uuid, __ -> {
+            NetworkSender.sendOrQueue(new PlayerSkinRequestPacket(uuid));
+            return new Property("textures", null, null);
+        });
+        if (skinData.getValue() != null) {
+            GameProfile gameProfile = new GameProfile(uuid, name);
+            gameProfile.getProperties().put("textures", skinData);
+            return gameProfile;
+        } else {
+            return new GameProfile(actualUUID, name);
+        }
+    }
+
     @Override
     void list(Consumer<Object> packetSink) {
-        packetSink.accept(ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, new GameProfile(uuid, name), GameMode.CREATIVE));
+        packetSink.accept(ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, getGameProfile(), GameMode.CREATIVE));
     }
 
     @Override
@@ -88,7 +115,7 @@ public class RPlayer extends REntity {
 
     @Override
     void delist(Consumer<Object> packetSink) {
-        packetSink.accept(ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(uuid, name), GameMode.CREATIVE));
+        packetSink.accept(ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, getGameProfile(), GameMode.CREATIVE));
     }
 
     private static final Class<?> namedSpawnPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundAddPlayerPacket");

SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java

@@ -19,9 +19,12 @@
 
 package de.steamwar.network;
 
+import com.mojang.authlib.properties.Property;
 import de.steamwar.core.BountifulWrapper;
+import de.steamwar.entity.RPlayer;
 import de.steamwar.network.handlers.InventoryHandler;
 import de.steamwar.network.packets.PacketHandler;
+import de.steamwar.network.packets.common.PlayerSkinResponsePacket;
 import de.steamwar.network.packets.server.*;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
@@ -68,4 +71,11 @@ public class CoreNetworkHandler extends PacketHandler {
     public void handleLocaleChange(LocaleInvalidationPacket packet) {
         SteamwarUser.invalidate(packet.getPlayerId());
     }
+
+    @Handler
+    public void handlePlayerSkinResponse(PlayerSkinResponsePacket packet) {
+        Property property = RPlayer.SKIN_DATA_PROMISES.get(packet.getUuid());
+        if (property == null) return;
+        RPlayer.SKIN_DATA_PROMISES.put(packet.getUuid(), new Property("textures", packet.getSkin(), packet.getSignature()));
+    }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java

@@ -24,8 +24,42 @@ import de.steamwar.network.packets.NetworkPacket;
 import lombok.SneakyThrows;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
 
-public class NetworkSender {
+import java.util.ArrayList;
+import java.util.List;
+
+public class NetworkSender implements Listener {
+
+    private static List<NetworkPacket> queued = new ArrayList<>();
+
+    static {
+        Bukkit.getPluginManager().registerEvents(new NetworkSender(), Core.getInstance());
+    }
+
+    private NetworkSender() {
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        if (!Bukkit.getOnlinePlayers().isEmpty()) {
+            return;
+        }
+        Bukkit.getScheduler().runTaskLater(Core.getInstance(), () -> {
+            queued.forEach(NetworkSender::send);
+            queued.clear();
+        }, 1);
+    }
+
+    public static void sendOrQueue(NetworkPacket packet) {
+        if (!Bukkit.getOnlinePlayers().isEmpty()) {
+            send(packet);
+        } else {
+            queued.add(packet);
+        }
+    }
 
     public static void send(NetworkPacket packet) {
         Bukkit.getOnlinePlayers().stream().findAny().ifPresent(player -> send(packet, player));