From 38d3f9b7c0a8764cb5252f7056734fb4779c69d9 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Wed, 10 Aug 2016 13:16:32 -0400 Subject: [PATCH] Client checks song flag first This fixes bugs with buffs marked as disc and song (they go to the song window now) Before the client got confused and gave up displaying them at all! --- zone/spells.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index 838d37162..6f7cc47b7 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -3060,19 +3060,19 @@ uint32 Mob::GetLastBuffSlot(bool disc, bool song) uint32 Client::GetFirstBuffSlot(bool disc, bool song) { - if (disc) - return GetMaxBuffSlots() + GetMaxSongSlots(); if (song) return GetMaxBuffSlots(); + if (disc) + return GetMaxBuffSlots() + GetMaxSongSlots(); return 0; } uint32 Client::GetLastBuffSlot(bool disc, bool song) { - if (disc) - return GetMaxBuffSlots() + GetMaxSongSlots() + GetCurrentDiscSlots(); if (song) return GetMaxBuffSlots() + GetCurrentSongSlots(); + if (disc) + return GetMaxBuffSlots() + GetMaxSongSlots() + GetCurrentDiscSlots(); return GetCurrentBuffSlots(); }