From c29af9c670166e1a651b939c91f10ebcb9ea6f9d Mon Sep 17 00:00:00 2001
From: Jack Sorrell <jack@jacksorrell.com>
Date: Wed, 24 Jul 2024 17:46:51 -0400
Subject: [PATCH] Add husks and strays to kill zombie and kill skeleton
 advancements

---
 CHANGELOG.md                                                 | 2 ++
 .../skyblock/advancements/progression/kill_skeleton.json     | 5 ++++-
 .../data/skyblock/advancements/progression/kill_zombie.json  | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65ba9fb0..156b7037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 * Command that immediately tries to spawn a Wandering Trader nearby (for testing)
 
 ### Changed
+* Kill Zombie advancement now accepts killing Husks
+* Kill Skeleton advancement now accepts killing Strays
 
 ### Deprecated
 
diff --git a/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_skeleton.json b/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_skeleton.json
index 0c5fac1c..cfb6cab1 100644
--- a/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_skeleton.json
+++ b/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_skeleton.json
@@ -20,7 +20,10 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:skeleton"
+              "type": [
+                "minecraft:skeleton",
+                "minecraft:stray"
+              ]
             }
           }
         ]
diff --git a/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_zombie.json b/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_zombie.json
index 1ba43e5d..73996b42 100644
--- a/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_zombie.json
+++ b/src/main/resources/resourcepacks/skyblock/data/skyblock/advancements/progression/kill_zombie.json
@@ -20,7 +20,10 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:zombie"
+              "type": [
+                "minecraft:zombie",
+                "minecraft:husk"
+              ]
             }
           }
         ]