From 4139610a241411296a47723d6d978047c52cc7cf Mon Sep 17 00:00:00 2001
From: MrDiamond64 <49098391+MrDiamond64@users.noreply.github.com>
Date: Mon, 9 Oct 2023 15:31:19 -0600
Subject: [PATCH] Fix CameraPresets parse error (#782)

* Fix CameraPresets parse error

* Fix requested changes
---
 data/bedrock/1.20.30/protocol.json | 67 ++++++++++++++++++------------
 data/bedrock/latest/proto.yml      | 10 +----
 data/bedrock/latest/types.yml      | 11 +++++
 3 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/data/bedrock/1.20.30/protocol.json b/data/bedrock/1.20.30/protocol.json
index 5317f97f7..69e48c91e 100644
--- a/data/bedrock/1.20.30/protocol.json
+++ b/data/bedrock/1.20.30/protocol.json
@@ -3989,6 +3989,41 @@
         }
       ]
     ],
+    "CameraPresets": [
+      "container",
+      [
+        {
+          "name": "name",
+          "type": "string"
+        },
+        {
+          "name": "parent",
+          "type": "string"
+        },
+        {
+          "name": "position",
+          "type": "Vec3fopts"
+        },
+        {
+          "name": "rotation",
+          "type": "Vec2fopts"
+        },
+        {
+          "name": "audio_listener",
+          "type": [
+            "option",
+            "u8"
+          ]
+        },
+        {
+          "name": "player_effects",
+          "type": [
+            "option",
+            "bool"
+          ]
+        }
+      ]
+    ],
     "mcpe_packet": [
       "container",
       [
@@ -11044,33 +11079,13 @@
       "container",
       [
         {
-          "name": "name",
-          "type": "string"
-        },
-        {
-          "name": "parent",
-          "type": "string"
-        },
-        {
-          "name": "position",
-          "type": "Vec3fopts"
-        },
-        {
-          "name": "rotation",
-          "type": "Vec2fopts"
-        },
-        {
-          "name": "audio_listener",
-          "type": [
-            "option",
-            "u8"
-          ]
-        },
-        {
-          "name": "player_effects",
+          "name": "presets",
           "type": [
-            "option",
-            "bool"
+            "array",
+            {
+              "countType": "varint",
+              "type": "CameraPresets"
+            }
           ]
         }
       ]
diff --git a/data/bedrock/latest/proto.yml b/data/bedrock/latest/proto.yml
index 333dbf44e..05d2aa030 100644
--- a/data/bedrock/latest/proto.yml
+++ b/data/bedrock/latest/proto.yml
@@ -3964,15 +3964,7 @@ packet_client_cheat_ability:
 packet_camera_presets:
    !id: 0xc6
    !bound: client
-   # Name is the name of the preset. Each preset must have their own unique name.
-   name: string
-   # Parent is the name of the preset that this preset extends upon. This can be left empty.
-   parent: string
-   position: Vec3fopts
-   rotation: Vec2fopts
-   ## TODO: make this an enum afer adding proper optional support inside pdefyaml
-   audio_listener?: u8
-   player_effects?: bool
+   presets: CameraPresets[]varint
 
 # unlocked_recipes gives the client a list of recipes that have been unlocked, restricting the recipes that appear in
 # the recipe book.
diff --git a/data/bedrock/latest/types.yml b/data/bedrock/latest/types.yml
index 8b51a3c8e..01523ff29 100644
--- a/data/bedrock/latest/types.yml
+++ b/data/bedrock/latest/types.yml
@@ -2115,3 +2115,14 @@ AbilityLayers:
    fly_speed: lf32
    # WalkSpeed is the default walk speed of the layer.
    walk_speed: lf32
+
+CameraPresets:
+   # Name is the name of the preset. Each preset must have their own unique name.
+   name: string
+   # Parent is the name of the preset that this preset extends upon. This can be left empty.
+   parent: string
+   position: Vec3fopts
+   rotation: Vec2fopts
+   ## TODO: make this an enum afer adding proper optional support inside pdefyaml
+   audio_listener?: u8
+   player_effects?: bool
\ No newline at end of file