From eda89030228b8da7c9651c0fbd68f5f3a79c1015 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Mon, 20 Mar 2023 09:24:25 +0100 Subject: [PATCH] make more entity packets not thread safe --- .../minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt | 2 +- .../protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt | 2 +- .../protocol/packets/s2c/play/entity/EntitySleepS2CP.kt | 2 +- .../packets/s2c/play/entity/passenger/EntityAttachS2CP.kt | 2 +- .../packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt index 0c2789c42..efd08b3d8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityDataS2CP.kt @@ -21,7 +21,7 @@ import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -@LoadPacket +@LoadPacket(threadSafe = false) class EntityDataS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entityId = buffer.readEntityId() val data: Int2ObjectOpenHashMap = buffer.readEntityData() diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt index d9e0116b8..bc24b7d61 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntityEquipmentS2CP.kt @@ -25,7 +25,7 @@ import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType -@LoadPacket +@LoadPacket(threadSafe = false) class EntityEquipmentS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entityId: Int = buffer.readEntityId() val equipment: Map diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt index f2728ef5a..328e102ed 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/EntitySleepS2CP.kt @@ -21,7 +21,7 @@ import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType -@LoadPacket +@LoadPacket(threadSafe = false) class EntitySleepS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entityId: Int = buffer.readInt() val blockPosition: Vec3i = if (buffer.versionId < ProtocolVersions.V_14W04A) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt index 293c6446e..e10a45e10 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityAttachS2CP.kt @@ -21,7 +21,7 @@ import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType -@LoadPacket +@LoadPacket(threadSafe = false) class EntityAttachS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val entityId: Int = buffer.readInt() val vehicle: Int = buffer.readInt() diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt index fd1e2ba20..2ddf3f41b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/passenger/EntityPassengerS2CP.kt @@ -22,7 +22,7 @@ import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType import it.unimi.dsi.fastutil.ints.IntOpenHashSet -@LoadPacket +@LoadPacket(threadSafe = false) class EntityPassengerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { val vehicle: Int = buffer.readVarInt() val passengers: IntOpenHashSet = IntOpenHashSet(buffer.readVarIntArray())