Merge branch 'master' into feature/global-base-scaling

2026-05-17 03:08:26 +00:00 · 2018-12-17 00:35:30 -06:00
parent 6b18c71c11 bbbee6e6b2
commit 52df2fa8d3
3 changed files with 19 additions and 0 deletions
@@ -3021,6 +3021,10 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 		if(effect1 != effect2)
 			continue;

+		if (IsBardOnlyStackEffect(effect1) && GetSpellLevel(spellid1, BARD) != 255 &&
+		    GetSpellLevel(spellid2, BARD) != 255)
+			continue;
+
 		// big ol' list according to the client, wasn't that nice!
 		if (IsEffectIgnoredInStacking(effect1))
 			continue;