Fix Spellcaster#onAttack not being called

Author: Malfrador

papyrus-api/src/main/java/de/erethon/spellbook/api/SpellCaster.java

@@ -91,6 +91,9 @@ default void tick() {
         }
     }
 
+    /**
+     * Called when this entity takes damage
+     */
     default double onDamage(LivingEntity damager, double damage, PDamageType type) {
         for (SpellbookSpell spell : getActiveSpells()) {
             damage = spell.onDamage(damager, damage, type);
@@ -104,6 +107,10 @@ default double onDamage(LivingEntity damager, double damage, PDamageType type) {
         return Math.max(damage, 0);
     }
 
+
+    /**
+     * Called when this entity deals damage
+     */
     default double onAttack(LivingEntity target, double damage, PDamageType type) {
         for (SpellbookSpell spell : getActiveSpells()) {
             damage = spell.onAttack(target, damage, type);

papyrus-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch

@@ -106,14 +106,15 @@
                          flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                          if (flag2) {
                              damageSource = damageSource.critical(); // Paper - critical damage API
-@@ -1245,147 +_,164 @@
+@@ -1245,147 +_,165 @@
                          }
 
                          Vec3 deltaMovement = target.getDeltaMovement();
 -                        boolean flag4 = target.hurtOrSimulate(damageSource, f2);
 +                        // Papyrus start - Add damage type
 +                        boolean flag4;
 +                        if (target instanceof LivingEntity livingEntity) {
++                            f2 = (float) getBukkitEntity().onAttack(livingEntity.getBukkitLivingEntity(), f2, attackDamageType.apiType);
 +                            flag4 = livingEntity.hurtServer((ServerLevel) level(), damageSource, f2, attackDamageType);
 +                        } else {
 +                            flag4 = target.hurtOrSimulate(damageSource, f2);