From a765aa75b9ce312d963ef4cd3d62e5da5ff2333f Mon Sep 17 00:00:00 2001
From: Harvey_Husky <harvey_husky@foxmail.com>
Date: Mon, 30 Dec 2024 15:25:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BC=BA=E5=A4=B1=E8=8B=8D=E7=99=BD?=
 =?UTF-8?q?=E6=A9=A1=E6=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../game_event/on_killed_mob_or_player.json   | 34 -------------------
 .../data/fzsd/tags/block/stripped_blocks.json | 25 ++++++++++++++
 data/fzsd/predicates/sweeper/whitelist.json   |  7 ++++
 data/fzsd/tags/block/stripped_blocks.json     |  6 ++--
 4 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json
 create mode 100644 compat_42/data/fzsd/tags/block/stripped_blocks.json

diff --git a/compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json b/compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json
deleted file mode 100644
index e9982f5..0000000
--- a/compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "parent": "fzsd:game_event",
-    "criteria": {
-        "on_killed_mob_or_player": {
-            "trigger": "minecraft:player_killed_entity",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:reference",
-                        "name": "fzsd:is_real_player"
-                    }
-                ],
-                "entity": [
-                    {
-                        "condition": "minecraft:inverted",
-                        "term": {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "type": "#fzsd:ignore_on_player_killed_entity"
-                            }
-                        }
-                    }
-                ],
-                "killing_blow": {
-                    "bypasses_invulnerability": false
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_killed_mob_or_player"
-    }
-}
\ No newline at end of file
diff --git a/compat_42/data/fzsd/tags/block/stripped_blocks.json b/compat_42/data/fzsd/tags/block/stripped_blocks.json
new file mode 100644
index 0000000..86c9557
--- /dev/null
+++ b/compat_42/data/fzsd/tags/block/stripped_blocks.json
@@ -0,0 +1,25 @@
+{
+    "replace": false,
+    "values": [
+        "minecraft:stripped_acacia_log",
+        "minecraft:stripped_acacia_wood",
+        "minecraft:stripped_birch_log",
+        "minecraft:stripped_birch_wood",
+        "minecraft:stripped_crimson_hyphae",
+        "minecraft:stripped_crimson_stem",
+        "minecraft:stripped_dark_oak_log",
+        "minecraft:stripped_dark_oak_wood",
+        "minecraft:stripped_jungle_log",
+        "minecraft:stripped_jungle_wood",
+        "minecraft:stripped_oak_log",
+        "minecraft:stripped_oak_wood",
+        "minecraft:stripped_spruce_log",
+        "minecraft:stripped_spruce_wood",
+        "minecraft:stripped_warped_hyphae",
+        "minecraft:stripped_warped_stem",
+        "minecraft:stripped_cherry_log",
+        "minecraft:stripped_cherry_wood",
+        "minecraft:stripped_mangrove_log",
+        "minecraft:stripped_mangrove_wood"
+    ]
+}
\ No newline at end of file
diff --git a/data/fzsd/predicates/sweeper/whitelist.json b/data/fzsd/predicates/sweeper/whitelist.json
index 2724344..e850275 100644
--- a/data/fzsd/predicates/sweeper/whitelist.json
+++ b/data/fzsd/predicates/sweeper/whitelist.json
@@ -85,6 +85,13 @@
                 "nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
             }
         },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "nbt": "{Item:{id:\"minecraft:pale_oak_boat\"}}"
+            }
+        },
         {
             "condition": "minecraft:entity_properties",
             "entity": "this",
diff --git a/data/fzsd/tags/block/stripped_blocks.json b/data/fzsd/tags/block/stripped_blocks.json
index 86c9557..1dc9158 100644
--- a/data/fzsd/tags/block/stripped_blocks.json
+++ b/data/fzsd/tags/block/stripped_blocks.json
@@ -20,6 +20,8 @@
         "minecraft:stripped_cherry_log",
         "minecraft:stripped_cherry_wood",
         "minecraft:stripped_mangrove_log",
-        "minecraft:stripped_mangrove_wood"
+        "minecraft:stripped_mangrove_wood",
+        "minecraft:stripped_pale_oak_log",
+        "minecraft:stripped_pale_oak_wood"
     ]
-}
\ No newline at end of file
+}