Fixed network error sending capabilities to the wrong players

src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java

@@ -22,7 +22,7 @@ import com.minelittlepony.unicopia.item.toxin.Toxicity;
 import com.minelittlepony.unicopia.item.toxin.Toxin;
 import com.minelittlepony.unicopia.network.Channel;
 import com.minelittlepony.unicopia.network.EffectSync;
-import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
+import com.minelittlepony.unicopia.network.MsgOtherPlayerCapabilities;
 import com.minelittlepony.unicopia.network.MsgRequestCapabilities;
 import com.minelittlepony.unicopia.network.Transmittable;
 import com.minelittlepony.unicopia.util.Copieable;
@@ -149,7 +149,9 @@ public class Pony implements Caster<PlayerEntity>, Equine<PlayerEntity>, Transmi
         dirty = false;
 
         if (entity instanceof ServerPlayerEntity) {
-            Channel.BROADCAST_CAPABILITIES.send(new MsgPlayerCapabilities(full, this));
+            MsgOtherPlayerCapabilities packet = new MsgOtherPlayerCapabilities(full, this);
+            Channel.SERVER_PLAYER_CAPABILITIES.send(entity, packet);
+            Channel.SERVER_OTHER_PLAYER_CAPABILITIES.send(entity, packet);
         }
     }
 

src/main/java/com/minelittlepony/unicopia/network/Channel.java

@@ -13,13 +13,9 @@ import net.minecraft.network.PacketByteBuf;
 public interface Channel {
 
     SPacketType<MsgPlayerAbility<?>> CLIENT_PLAYER_ABILITY = clientToServer(new Identifier("unicopia", "player_ability"), MsgPlayerAbility::new);
-
     SPacketType<MsgRequestCapabilities> CLIENT_REQUEST_CAPABILITIES = clientToServer(new Identifier("unicopia", "request_capabilities"), MsgRequestCapabilities::new);
-
     CPacketType<MsgPlayerCapabilities> SERVER_PLAYER_CAPABILITIES = serverToClient(new Identifier("unicopia", "player_capabilities"), MsgPlayerCapabilities::new);
-
+    MPacketType<MsgOtherPlayerCapabilities> SERVER_OTHER_PLAYER_CAPABILITIES = serverToClients(new Identifier("unicopia", "other_player_capabilities"), MsgOtherPlayerCapabilities::new);
-    SPacketType<MsgPlayerCapabilities> BROADCAST_CAPABILITIES = broadcast(SERVER_PLAYER_CAPABILITIES, MsgPlayerCapabilities::new);
-
     CPacketType<MsgSpawnProjectile> SERVER_SPAWN_PROJECTILE = serverToClient(new Identifier("unicopia", "projectile_entity"), MsgSpawnProjectile::new);
 
     static void bootstrap() { }
@@ -29,19 +25,8 @@ public interface Channel {
         return () -> id;
     }
 
-    static <T extends Packet> SPacketType<T> broadcast(CPacketType<T> redirect, Function<PacketByteBuf, T> factory) {
+    static <T extends Packet> MPacketType<T> serverToClients(Identifier id, Function<PacketByteBuf, T> factory) {
-        Identifier id = new Identifier(redirect.getId().getNamespace(), "broadcast_" + redirect.getId().getPath());
+        ClientSidePacketRegistry.INSTANCE.register(id, (context, buffer) -> factory.apply(buffer).handleOnMain(context));
-        ServerSidePacketRegistry.INSTANCE.register(id, (context, buffer) -> {
-            PlayerEntity sender = context.getPlayer();
-
-            T p = factory.apply(buffer);
-            p.handleOnMain(context);
-            sender.world.getPlayers().forEach(player -> {
-                if (player != null) {
-                    redirect.send(player, p);
-                }
-            });
-        });
         return () -> id;
     }
 
@@ -50,6 +35,22 @@ public interface Channel {
         return () -> id;
     }
 
+    interface MPacketType<T extends Packet> {
+        Identifier getId();
+
+        default void send(PlayerEntity sender, T packet) {
+            sender.world.getPlayers().forEach(player -> {
+                if (player != null) {
+                    ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, getId(), packet.toBuffer());
+                }
+            });
+        }
+
+        default net.minecraft.network.Packet<?> toPacket(T packet) {
+            return ServerSidePacketRegistry.INSTANCE.toPacket(getId(), packet.toBuffer());
+        }
+    }
+
     interface CPacketType<T extends Packet> {
         Identifier getId();
 

src/main/java/com/minelittlepony/unicopia/network/MsgOtherPlayerCapabilities.java

@@ -0,0 +1,25 @@
+package com.minelittlepony.unicopia.network;
+
+import com.minelittlepony.unicopia.entity.player.Pony;
+
+import net.fabricmc.fabric.api.network.PacketContext;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.network.PacketByteBuf;
+
+public class MsgOtherPlayerCapabilities extends MsgPlayerCapabilities {
+
+    MsgOtherPlayerCapabilities(PacketByteBuf buffer) {
+        super(buffer);
+
+    }
+
+    public MsgOtherPlayerCapabilities(boolean full, Pony player) {
+        super(full, player);
+
+    }
+
+    @Override
+    protected Pony getRecipient(PacketContext context) {
+        return Pony.of(MinecraftClient.getInstance().world.getPlayerByUuid(playerId));
+    }
+}

src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java

@@ -3,24 +3,29 @@ package com.minelittlepony.unicopia.network;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.UUID;
+
 import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
 import net.fabricmc.fabric.api.network.PacketContext;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
 
 public class MsgPlayerCapabilities implements Channel.Packet {
 
+    protected final UUID playerId;
+
     private final Race newRace;
 
     private final CompoundTag compoundTag;
 
     MsgPlayerCapabilities(PacketByteBuf buffer) {
+        playerId = buffer.readUuid();
         newRace = Race.values()[buffer.readInt()];
         try (InputStream in = new ByteBufInputStream(buffer)) {
             compoundTag = NbtIo.readCompressed(in);
@@ -29,18 +34,15 @@ public class MsgPlayerCapabilities implements Channel.Packet {
         }
     }
 
-    public MsgPlayerCapabilities(Race race, PlayerEntity player) {
-        newRace = race;
-        compoundTag = new CompoundTag();
-    }
-
     public MsgPlayerCapabilities(boolean full, Pony player) {
+        playerId = player.getOwner().getUuid();
         newRace = player.getSpecies();
         compoundTag = full ? player.toNBT() : new CompoundTag();
     }
 
     @Override
     public void toBuffer(PacketByteBuf buffer) {
+        buffer.writeUuid(playerId);
         buffer.writeInt(newRace.ordinal());
         try (OutputStream out = new ByteBufOutputStream(buffer)) {
             NbtIo.writeCompressed(compoundTag, out);
@@ -50,11 +52,18 @@ public class MsgPlayerCapabilities implements Channel.Packet {
 
     @Override
     public void handle(PacketContext context) {
-        Pony player = Pony.of(context.getPlayer());
+        Pony player = getRecipient(context);
+        if (player == null) {
+            Unicopia.LOGGER.warn("Skipping capabilities for unknown player " + playerId.toString());
+        }
         if (compoundTag.isEmpty()) {
             player.setSpecies(newRace);
         } else {
             player.fromNBT(compoundTag);
         }
     }
+
+    protected Pony getRecipient(PacketContext context) {
+        return Pony.of(context.getPlayer());
+    }
 }