mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-26 22:02:26 +00:00
Fix for LDoN treasure npcs poofing - please report any issues
This commit is contained in:
parent
141d6e3e8b
commit
09589edcdd
@ -1,5 +1,8 @@
|
|||||||
EQEMu Changelog (Started on Sept 24, 2003 15:50)
|
EQEMu Changelog (Started on Sept 24, 2003 15:50)
|
||||||
-------------------------------------------------------
|
-------------------------------------------------------
|
||||||
|
== 03/01/2016 ==
|
||||||
|
Uleat: Fix for LDoN treasure 'npcs' not leaving a corpse (please report any issues..)
|
||||||
|
|
||||||
== 02/29/2016 ==
|
== 02/29/2016 ==
|
||||||
Uleat: Change in AddItemBonuses - now includes ammo slot for skill mods only. Defined SoD- client SkillModMax packet property (client does not show..but, does enforce.)
|
Uleat: Change in AddItemBonuses - now includes ammo slot for skill mods only. Defined SoD- client SkillModMax packet property (client does not show..but, does enforce.)
|
||||||
|
|
||||||
|
|||||||
@ -2138,8 +2138,9 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, SkillUseTypes attac
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!HasOwner() && !IsMerc() && class_ != MERCHANT && class_ != ADVENTUREMERCHANT && !GetSwarmInfo()
|
if (!HasOwner() && !IsMerc() && class_ != MERCHANT && class_ != ADVENTUREMERCHANT && !GetSwarmInfo()
|
||||||
&& MerchantType == 0 && killer && (killer->IsClient() || (killer->HasOwner() && killer->GetUltimateOwner()->IsClient()) ||
|
&& MerchantType == 0 && ((killer && (killer->IsClient() || (killer->HasOwner() && killer->GetUltimateOwner()->IsClient()) ||
|
||||||
(killer->IsNPC() && killer->CastToNPC()->GetSwarmInfo() && killer->CastToNPC()->GetSwarmInfo()->GetOwner() && killer->CastToNPC()->GetSwarmInfo()->GetOwner()->IsClient())))
|
(killer->IsNPC() && killer->CastToNPC()->GetSwarmInfo() && killer->CastToNPC()->GetSwarmInfo()->GetOwner() && killer->CastToNPC()->GetSwarmInfo()->GetOwner()->IsClient())))
|
||||||
|
|| (killer_mob && IsLdonTreasure)))
|
||||||
{
|
{
|
||||||
if (killer != 0) {
|
if (killer != 0) {
|
||||||
if (killer->GetOwner() != 0 && killer->GetOwner()->IsClient())
|
if (killer->GetOwner() != 0 && killer->GetOwner()->IsClient())
|
||||||
@ -2213,6 +2214,11 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, SkillUseTypes attac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (killer_mob && IsLdonTreasure) {
|
||||||
|
auto u_owner = killer_mob->GetUltimateOwner();
|
||||||
|
if (u_owner->IsClient())
|
||||||
|
corpse->AllowPlayerLoot(u_owner, 0);
|
||||||
|
}
|
||||||
|
|
||||||
if (zone && zone->adv_data) {
|
if (zone && zone->adv_data) {
|
||||||
ServerZoneAdventureDataReply_Struct *sr = (ServerZoneAdventureDataReply_Struct*)zone->adv_data;
|
ServerZoneAdventureDataReply_Struct *sr = (ServerZoneAdventureDataReply_Struct*)zone->adv_data;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user