diff --git a/data/pc/1.8/proto.yml b/data/pc/1.8/proto.yml
index ecf1b677f..26ece40b0 100644
--- a/data/pc/1.8/proto.yml
+++ b/data/pc/1.8/proto.yml
@@ -283,17 +283,13 @@
       z: i32
       pitch: i8
       yaw: i8
-      objectData:      
-         intField: i32
-         velocityX: intField ?
-            if 0: void
-            default: i16
-         velocityY: intField ?
-            if 0: void
-            default: i16
-         velocityZ: intField ?
-            if 0: void
-            default: i16
+      intField: i32
+      objectData: intField ?
+         if 0: void
+         default:
+            velocityX: i16
+            velocityY: i16
+            velocityZ: i16
    packet_spawn_entity_living:   
       entityId: varint
       type: u8
diff --git a/data/pc/1.8/protocol.json b/data/pc/1.8/protocol.json
index a0e63d7e2..f2c901fd5 100644
--- a/data/pc/1.8/protocol.json
+++ b/data/pc/1.8/protocol.json
@@ -831,55 +831,37 @@
               "name": "yaw",
               "type": "i8"
             },
+            {
+              "name": "intField",
+              "type": "i32"
+            },
             {
               "name": "objectData",
               "type": [
-                "container",
-                [
-                  {
-                    "name": "intField",
-                    "type": "i32"
+                "switch",
+                {
+                  "compareTo": "intField",
+                  "fields": {
+                    "0": "void"
                   },
-                  {
-                    "name": "velocityX",
-                    "type": [
-                      "switch",
+                  "default": [
+                    "container",
+                    [
                       {
-                        "compareTo": "intField",
-                        "fields": {
-                          "0": "void"
-                        },
-                        "default": "i16"
-                      }
-                    ]
-                  },
-                  {
-                    "name": "velocityY",
-                    "type": [
-                      "switch",
+                        "name": "velocityX",
+                        "type": "i16"
+                      },
                       {
-                        "compareTo": "intField",
-                        "fields": {
-                          "0": "void"
-                        },
-                        "default": "i16"
-                      }
-                    ]
-                  },
-                  {
-                    "name": "velocityZ",
-                    "type": [
-                      "switch",
+                        "name": "velocityY",
+                        "type": "i16"
+                      },
                       {
-                        "compareTo": "intField",
-                        "fields": {
-                          "0": "void"
-                        },
-                        "default": "i16"
+                        "name": "velocityZ",
+                        "type": "i16"
                       }
                     ]
-                  }
-                ]
+                  ]
+                }
               ]
             }
           ]