diff --git a/changelog.txt b/changelog.txt index 3a6858ffb..d9022beda 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- == 04/21/2014 == Secrets: Crash fix for more hatelist crashes. +Secrets: Hate list fixes, again. == 04/20/2014 == Secrets: Changed the functionality of EQDEBUG cmake flag. It now suppresses logs, but shows crashes in any scenario when set to 1. It will also now show crashes even if the log system is disabled. diff --git a/zone/StringIDs.h b/zone/StringIDs.h index c916b1de0..9a222d276 100644 --- a/zone/StringIDs.h +++ b/zone/StringIDs.h @@ -304,6 +304,7 @@ #define SLOW_PARTIALLY_SUCCESSFUL 9030 // Your spell was partially successful. #define SLOW_SLIGHTLY_SUCCESSFUL 9031 //Your spell was slightly successful. #define SPELL_OPPOSITE_EFFECT 9032 //Your spell may have had the opposite effect of what you desired. +#define HAS_BEEN_AWAKENED 9037 //%1 has been awakened by %2. #define YOU_HEAL 9068 //You have healed %1 for %2 points of damage. #define YOUR_HIT_DOT 9072 //%1 has taken %2 damage from your %3. #define HIT_NON_MELEE 9073 //%1 hit %2 for %3 points of non-melee damage. diff --git a/zone/attack.cpp b/zone/attack.cpp index 324f5942d..e1f6b5135 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -3616,6 +3616,8 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons //fade mez if we are mezzed if (IsMezzed()) { mlog(COMBAT__HITS, "Breaking mez due to attack."); + entity_list.MessageClose_StringID(this, true, 100, MT_WornOff, + HAS_BEEN_AWAKENED, GetCleanName(), attacker->GetCleanName()); BuffFadeByEffect(SE_Mez); }