Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Units: Fixed crash happening whenall tappers of a creature are logged out when it dies inside a dungeon

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/6cac60782f0bc67c0f4b70b41cac36357fbd2531)
This commit is contained in:
hondacrx
2023-01-18 17:01:40 -05:00
parent 48842f24bd
commit 23ff218f0e
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/KillRewarder.cs
+10 -7
View File
@@ -105,14 +105,17 @@ namespace Game.Entities
instance.UpdateEncounterStateForKilledCreature(_victim.GetEntry(), _victim); instance.UpdateEncounterStateForKilledCreature(_victim.GetEntry(), _victim);
} }
uint guildId = victim.GetMap().GetOwnerGuildId(); if (!_killers.Empty())
var guild = Global.GuildMgr.GetGuildById(guildId); {
if (guild != null) uint guildId = victim.GetMap().GetOwnerGuildId();
guild.UpdateCriteria(CriteriaType.KillCreature, victim.GetEntry(), 1, 0, victim, _killers.First()); var guild = Global.GuildMgr.GetGuildById(guildId);
if (guild != null)
guild.UpdateCriteria(CriteriaType.KillCreature, victim.GetEntry(), 1, 0, victim, _killers.First());
Scenario scenario = victim.GetScenario(); Scenario scenario = victim.GetScenario();
if (scenario != null) if (scenario != null)
scenario.UpdateCriteria(CriteriaType.KillCreature, victim.GetEntry(), 1, 0, victim, _killers.First()); scenario.UpdateCriteria(CriteriaType.KillCreature, victim.GetEntry(), 1, 0, victim, _killers.First());
}
} }
} }
Source/Game/Entities/Unit/Unit.Combat.cs
+4 -4
View File
@@ -765,17 +765,17 @@ namespace Game.Entities
if (creature.GetMap().IsDungeon()) if (creature.GetMap().IsDungeon())
{ {
Group group = !groups.Empty() ? groups.First() : null;
Player looter = group ? Global.ObjAccessor.GetPlayer(creature, group.GetLooterGuid()) : tappers[0];
if (dungeonEncounter != null) if (dungeonEncounter != null)
{ {
creature.m_personalLoot = LootManager.GenerateDungeonEncounterPersonalLoot(dungeonEncounter.Id, creature.GetCreatureTemplate().LootId, creature.m_personalLoot = LootManager.GenerateDungeonEncounterPersonalLoot(dungeonEncounter.Id, creature.GetCreatureTemplate().LootId,
LootStorage.Creature, LootType.Corpse, creature, creature.GetCreatureTemplate().MinGold, creature.GetCreatureTemplate().MaxGold, LootStorage.Creature, LootType.Corpse, creature, creature.GetCreatureTemplate().MinGold, creature.GetCreatureTemplate().MaxGold,
(ushort)creature.GetLootMode(), creature.GetMap().GetDifficultyLootItemContext(), tappers); (ushort)creature.GetLootMode(), creature.GetMap().GetDifficultyLootItemContext(), tappers);
} }
else else if (!tappers.Empty())
{ {
Group group = !groups.Empty() ? groups.First() : null;
Player looter = group ? Global.ObjAccessor.GetPlayer(creature, group.GetLooterGuid()) : tappers[0];
Loot loot = new(creature.GetMap(), creature.GetGUID(), LootType.Corpse, dungeonEncounter != null ? group : null); Loot loot = new(creature.GetMap(), creature.GetGUID(), LootType.Corpse, dungeonEncounter != null ? group : null);
uint lootid = creature.GetCreatureTemplate().LootId; uint lootid = creature.GetCreatureTemplate().LootId;