12312/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix ClassCastException for replay player equipment

Browse Source 
PacketProcessor passes Bukkit EquipmentSlots to REntity#setItem, which cast
them to the NMS EquipmentSlot. Take the Bukkit slot and map it to the NMS
slot when building the equipment packet.
This commit is contained in:
YoyoNow
2026-10-19 08:38:42 +02:00
parent 097df865e5
commit 69aef9dfb6
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
+15 -4
View File
@@ -89,7 +89,7 @@ public class REntity {
private final int objectData; private final int objectData;
@Getter @Getter
private String displayName; private String displayName;
protected final Map<Object, ItemStack> itemSlots; protected final Map<org.bukkit.inventory.EquipmentSlot, ItemStack> itemSlots;
public REntity(REntityServer server, EntityType entityType, Location location) { public REntity(REntityServer server, EntityType entityType, Location location) {
this(server, entityType, location, 0); this(server, entityType, location, 0);
@@ -220,7 +220,7 @@ public class REntity {
.add(nameVisibleWatcher, displayName != null).build()); .add(nameVisibleWatcher, displayName != null).build());
} }
public void setItem(Object slot, ItemStack stack) { public void setItem(org.bukkit.inventory.EquipmentSlot slot, ItemStack stack) {
itemSlots.put(slot, stack); itemSlots.put(slot, stack);
server.updateEntity(this, getEquipmentPacket(slot, stack)); server.updateEntity(this, getEquipmentPacket(slot, stack));
} }
@@ -368,8 +368,19 @@ public class REntity {
return packet; return packet;
} }
protected Object getEquipmentPacket(Object slot, ItemStack stack) { protected Object getEquipmentPacket(org.bukkit.inventory.EquipmentSlot slot, ItemStack stack) {
return new ClientboundSetEquipmentPacket(entityId, Collections.singletonList(Pair.of((EquipmentSlot) slot, CraftItemStack.asNMSCopy(stack)))); return new ClientboundSetEquipmentPacket(entityId, Collections.singletonList(Pair.of(toNmsSlot(slot), CraftItemStack.asNMSCopy(stack))));
}
private static EquipmentSlot toNmsSlot(org.bukkit.inventory.EquipmentSlot slot) {
return switch (slot) {
case HEAD -> EquipmentSlot.HEAD;
case CHEST -> EquipmentSlot.CHEST;
case LEGS -> EquipmentSlot.LEGS;
case FEET -> EquipmentSlot.FEET;
case OFF_HAND -> EquipmentSlot.OFFHAND;
default -> EquipmentSlot.MAINHAND;
};
} }
private byte rotToByte(float rot) { private byte rotToByte(float rot) {
SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class RPlayer extends REntity implements RInteractableEntity<RPlayer> {
packetSink.accept(getNamedSpawnPacket()); packetSink.accept(getNamedSpawnPacket());
entityDataPacket().add(skinPartsDataWatcher, (byte) 0x7F).send(packetSink); entityDataPacket().add(skinPartsDataWatcher, (byte) 0x7F).send(packetSink);
for (Map.Entry<Object, ItemStack> entry : itemSlots.entrySet()) { for (Map.Entry<org.bukkit.inventory.EquipmentSlot, ItemStack> entry : itemSlots.entrySet()) {
packetSink.accept(getEquipmentPacket(entry.getKey(), entry.getValue())); packetSink.accept(getEquipmentPacket(entry.getKey(), entry.getValue()));
} }