From e2c908b4b38956338cfab536ad477e6b67f8fa62 Mon Sep 17 00:00:00 2001
From: Misode <misoloo64@gmail.com>
Date: Mon, 7 Oct 2024 16:38:25 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20fox=20and=20conduit=20UUID?=
 =?UTF-8?q?=20changes=20from=201.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java/server/world/block/conduit.mcdoc            | 11 ++++++-----
 java/server/world/entity/mob/breedable/fox.mcdoc |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/java/server/world/block/conduit.mcdoc b/java/server/world/block/conduit.mcdoc
index 192ec26..86a10b4 100644
--- a/java/server/world/block/conduit.mcdoc
+++ b/java/server/world/block/conduit.mcdoc
@@ -1,10 +1,11 @@
 dispatch minecraft:block_entity[conduit] to struct Conduit {
 	...super::BlockEntity,
-	#[uuid]
-	target_uuid?: (
-		#[until="1.16"] TargetUuid |
-		#[since="1.16"] int[] @ 4 |
-	),
+	/// The hostile mob that the conduit is currently attacking.
+	#[until="1.16"] 
+	target_uuid?: #[uuid] TargetUuid,
+	/// The hostile mob that the conduit is currently attacking.
+	#[since="1.16"]
+	Target?: #[uuid] int[] @ 4,
 }
 
 dispatch minecraft:block[conduit] to minecraft:block_entity[conduit]
diff --git a/java/server/world/entity/mob/breedable/fox.mcdoc b/java/server/world/entity/mob/breedable/fox.mcdoc
index 7c8d156..ebc6eef 100644
--- a/java/server/world/entity/mob/breedable/fox.mcdoc
+++ b/java/server/world/entity/mob/breedable/fox.mcdoc
@@ -1,10 +1,11 @@
 dispatch minecraft:entity[fox] to struct Fox {
 	...super::Breedable,
 	/// List of trusted players.
-	TrustedUUIDs?: [#[uuid] (
-		#[until="1.16"] TrustedUUID |
-		#[since="1.16"] int[] @ 4 |
-	)],
+	#[until="1.16"]
+	TrustedUUIDs?: [#[uuid] TrustedUUID],
+	/// List of trusted players.
+	#[since="1.16"]
+	Trusted?: [#[uuid] int[] @ 4],
 	/// Whether it is sleeping.
 	Sleeping?: boolean,
 	/// The type of fox.