mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10246] Restore work killCredit and kill achievements in regular difficulty instances.

Browse source
This commit is contained in:
VladimirMangos 2010-07-22 13:08:43 +04:00
parent 384915b0d0
commit 9d8b66cf93
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Creature.cpp
View file

@ -2032,8 +2032,6 @@ void Creature::AllLootRemovedFromCorpse()
{ {
uint32 nDeathTimer; uint32 nDeathTimer;
CreatureInfo const *cinfo = GetCreatureInfo();
// corpse was not skinned -> apply corpse looted timer // corpse was not skinned -> apply corpse looted timer
if (!lootForSkin) if (!lootForSkin)
nDeathTimer = (uint32)((m_corpseDelay * IN_MILLISECONDS) * sWorld.getConfig(CONFIG_FLOAT_RATE_CORPSE_DECAY_LOOTED)); nDeathTimer = (uint32)((m_corpseDelay * IN_MILLISECONDS) * sWorld.getConfig(CONFIG_FLOAT_RATE_CORPSE_DECAY_LOOTED));

3
src/game/Group.cpp
View file

@ -1842,7 +1842,8 @@ static void RewardGroupAtKill_helper(Player* pGroupGuy, Unit* pVictim, uint32 co
{ {
// normal creature (not pet/etc) can be only in !PvP case // normal creature (not pet/etc) can be only in !PvP case
if(pVictim->GetTypeId()==TYPEID_UNIT) if(pVictim->GetTypeId()==TYPEID_UNIT)
pGroupGuy->KilledMonster(((Creature*)pVictim)->GetCreatureInfo(), pVictim->GetObjectGuid()); if(CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
pGroupGuy->KilledMonster(normalInfo, pVictim->GetObjectGuid());
} }
} }
} }

4
src/game/Player.cpp
View file

@ -6262,6 +6262,7 @@ void Player::RewardReputation(Unit *pVictim, float rate)
if(!pVictim || pVictim->GetTypeId() == TYPEID_PLAYER) if(!pVictim || pVictim->GetTypeId() == TYPEID_PLAYER)
return; return;
// used current difficulty creature entry instead normal version (GetEntry())
ReputationOnKillEntry const* Rep = sObjectMgr.GetReputationOnKilEntry(((Creature*)pVictim)->GetCreatureInfo()->Entry); ReputationOnKillEntry const* Rep = sObjectMgr.GetReputationOnKilEntry(((Creature*)pVictim)->GetCreatureInfo()->Entry);
if(!Rep) if(!Rep)
@ -20260,7 +20261,8 @@ void Player::RewardSinglePlayerAtKill(Unit* pVictim)
// normal creature (not pet/etc) can be only in !PvP case // normal creature (not pet/etc) can be only in !PvP case
if(pVictim->GetTypeId()==TYPEID_UNIT) if(pVictim->GetTypeId()==TYPEID_UNIT)
KilledMonster(((Creature*)pVictim)->GetCreatureInfo(), pVictim->GetObjectGuid()); if(CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
KilledMonster(normalInfo, pVictim->GetObjectGuid());
} }
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10245" #define REVISION_NR "10246"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__