From 5712734c4ea6d5b3e87496b930dd94cae62b4b33 Mon Sep 17 00:00:00 2001
From: Provismet <17149901+Provismet@users.noreply.github.com>
Date: Thu, 25 Jul 2024 18:43:51 +0100
Subject: [PATCH] Use player attack damage type tag for standard attack.

---
 .../data/combat-plus/tags/damage_type/standard_attack.json   | 5 ++++-
 .../datagen/CombatPlusCore/DamageTypeTagGenerator.java       | 2 +-
 2 files changed, 5 insertions(+), 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
index 3c88cae..461c49f 100644
--- 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
index 29cedf5..a0d5830 100644
--- 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);