pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 16:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into shared_mem

Browse Source
This commit is contained in:
KimLS 2013-02-18 19:26:11 -08:00
commit d4dbf0042e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -5,6 +5,7 @@ Bad_Captain: Moved merc save to merc table, save merc buffs, added cure and rez
JJ: Chat garbled for drunk characters. JJ: Chat garbled for drunk characters.
Derision: Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet. Derision: Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet.
demonstar55: Added potionbelt tool tip demonstar55: Added potionbelt tool tip
KLS: Added EVENT_DEATH to Player Quests
REQUIRED SQL: 2013_02_18_Merc_Rules_and_Tables.sql REQUIRED SQL: 2013_02_18_Merc_Rules_and_Tables.sql
OPTIONAL SQL: 2013_02_18_Merc_Spells.sql OPTIONAL SQL: 2013_02_18_Merc_Spells.sql

1
zone/attack.cpp
View File

@ -1441,6 +1441,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_
SetHorseId(0); SetHorseId(0);
dead = true; dead = true;
parse->EventPlayer(EVENT_DEATH, this, "", 0);
if (killerMob != NULL) if (killerMob != NULL)
{ {