josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Use map pointer of killed creature instead of player pointer to prevent crash in case killer is not in world.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-20 16:59:15 +02:00
parent ffcbd11b2c
commit b1183c931b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Formulas.h
+1 -1
View File
@@ -117,7 +117,7 @@ namespace Trinity
(((Creature*)u)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) )) (((Creature*)u)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) ))
return 0; return 0;
uint32 xp_gain= BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(pl->GetMapId(),pl->GetZoneId())); uint32 xp_gain= BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(u->GetMapId(),u->GetZoneId()));
if( xp_gain == 0 ) if( xp_gain == 0 )
return 0; return 0;
src/game/Unit.cpp
+1
View File
@@ -13668,6 +13668,7 @@ void Unit::SetToNotify()
void Unit::Kill(Unit *pVictim, bool durabilityLoss) void Unit::Kill(Unit *pVictim, bool durabilityLoss)
{ {
assert(pVictim->IsInWorld() && pVictim->FindMap());
// Prevent killing unit twice (and giving reward from kill twice) // Prevent killing unit twice (and giving reward from kill twice)
if (!pVictim->GetHealth()) if (!pVictim->GetHealth())
return; return;