diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt
index ccccdd3bc..d689035dd 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt
@@ -92,10 +92,10 @@ abstract class PlayerEntity(
 
     protected open fun updateSkinParts(flags: Int) {
         for (part in SkinParts.VALUES) {
-            if (!flags.isBitMask(part.bitmask)) {
-                skinParts -= part
-            } else {
+            if (flags.isBitMask(part.bitmask)) {
                 skinParts += part
+            } else {
+                skinParts -= part
             }
         }
     }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt
index 594b9d377..a6f01f016 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/entity/spawn/EntityObjectSpawnS2CP.kt
@@ -13,6 +13,7 @@
 package de.bixilon.minosoft.protocol.packets.s2c.play.entity.spawn
 
 import de.bixilon.kotlinglm.vec3.Vec3d
+import de.bixilon.minosoft.data.entities.EntityRotation
 import de.bixilon.minosoft.data.entities.entities.Entity
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
@@ -42,7 +43,9 @@ class EntityObjectSpawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
             buffer.readVarInt()
         }
         val position: Vec3d = buffer.readVec3d()
-        val rotation = buffer.readEntityRotation() // ToDo: Is yaw/pitch swapped?
+        val pitch = buffer.readAngle() // yaw/pitch is swapped
+        val yaw = buffer.readAngle()
+        val rotation = EntityRotation(yaw, pitch)
         if (buffer.versionId >= ProtocolVersions.V_22W14A) {
             val headYaw = buffer.readAngle()
         }