Use player attack damage type tag for standard attack.

Provismet · Jul 25, 2024 · 5712734 · 5712734
1 parent 7a6e40d
commit 5712734
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/generated/data/combat-plus/tags/damage_type/standard_attack.json b/src/main/generated/data/combat-plus/tags/damage_type/standard_attack.json
@@ -1,6 +1,9 @@
 {
   "values": [
-    "minecraft:player_attack",
+    {
+      "id": "#minecraft:is_player_attack",
+      "required": false
+    },
     "minecraft:mob_attack",
     "minecraft:mob_attack_no_aggro"
   ]

diff --git a/src/main/java/com/provismet/datagen/CombatPlusCore/DamageTypeTagGenerator.java b/src/main/java/com/provismet/datagen/CombatPlusCore/DamageTypeTagGenerator.java
@@ -18,7 +18,7 @@ public DamageTypeTagGenerator (FabricDataOutput output, CompletableFuture<Regist
     @Override
     protected void configure (RegistryWrapper.WrapperLookup wrapperLookup) {
         getOrCreateTagBuilder(CPCDamageTypeTags.STANDARD_ATTACK)
-            .add(DamageTypes.PLAYER_ATTACK)
+            .addOptionalTag(DamageTypeTags.IS_PLAYER_ATTACK)
             .add(DamageTypes.MOB_ATTACK)
             .add(DamageTypes.MOB_ATTACK_NO_AGGRO);