From 1f25ebc90abb07c25a8b059e54dcc0fc49e69ecc Mon Sep 17 00:00:00 2001
From: Haydrich <54556365+Haydrich@users.noreply.github.com>
Date: Wed, 11 Sep 2024 06:25:35 -0700
Subject: [PATCH] Corrected Spore Explosion and Earth Shaker skills effect
 (#8611)

---
 db/re/status.yml  | 3 +++
 src/map/skill.cpp | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/db/re/status.yml b/db/re/status.yml
index ce888854d3..73e96067b6 100644
--- a/db/re/status.yml
+++ b/db/re/status.yml
@@ -7022,7 +7022,9 @@ Body:
     CalcFlags:
       Regen: true
   - Status: Earthshaker
+    Icon: EFST_EARTHSHAKER
     Flags:
+      BlEffect: true
       NoWarning: true
   - Status: Weaponblock_On
     Icon: EFST_WEAPONBLOCK_ON
@@ -7037,6 +7039,7 @@ Body:
     Icon: EFST_SPORE_EXPLOSION_DEBUFF
     DurationLookup: GN_SPORE_EXPLOSION
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 1a579d3c5f..c7d0b59392 100755
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -1956,8 +1956,9 @@ int skill_additional_effect( struct block_list* src, struct block_list *bl, uint
 		sc_start(src,bl, SC_SILENCE, 5 * skill_lv + (status_get_dex(src) + status_get_lv(src)) / 10, skill_lv, skill_get_time(skill_id, skill_lv));
 		break;
 	case SR_EARTHSHAKER:
+		if (dstmd != nullptr && dstmd->guardian_data == nullptr)    // Target is a mob (boss included) and not a guardian type. [Atemo]
+			sc_start(src, bl, SC_EARTHSHAKER, 100, skill_lv, skill_get_time2(skill_id, skill_lv));
 		sc_start(src,bl,SC_STUN, 25 + 5 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));
-		sc_start(src, bl, SC_EARTHSHAKER, 100, skill_lv, skill_get_time2(skill_id, skill_lv));
 		status_change_end(bl, SC_SV_ROOTTWIST);
 		break;
 	case SO_EARTHGRAVE: