[demonstar55]

Apparently I missed some things or didn't test that change enough

Index: attack.cpp
===================================================================
--- attack.cpp  (revision 2146)
+++ attack.cpp  (working copy)
@@ -3392,7 +3392,7 @@

                                if(attacker && attacker->IsClient() && (spell_id != SPELL_UNKNOWN) && damage>0) {
                                        char val1[20]={0};
-                                       attacker->Message_StringID(4,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1));
+                                       entity_list.MessageClose_StringID(this, false, 100, MT_NonMelee, HIT_NON_MELEE, attacker->GetCleanName(), GetCleanName(),ConvertArray(damage,val1));
                                }

                                Death(attacker, damage, spell_id, skill_used);
@@ -3534,7 +3534,10 @@
                                if (((spell_id != SPELL_UNKNOWN)||(FromDamageShield)) && damage>0) {
                                        //special crap for spell damage, looks hackish to me
                                        char val1[20]={0};
-                                       attacker->Message_StringID(MT_NonMelee,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1));
+                                       if (FromDamageShield)
+                                               attacker->Message_StringID(MT_NonMelee,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1));
+                                       else
+                                               entity_list.MessageClose_StringID(this, false, 100, MT_NonMelee,HIT_NON_MELEE,attacker->GetCleanName(),GetCleanName(),ConvertArray(damage,val1));
                            } else {
                                if(damage > 0) {
                                                if(spell_id != SPELL_UNKNOWN)