Core/Spells: Fix UNIT_CREATED_BY_SPELL in SPELL_EFFECT_SUMMON
Port From (https://github.com/TrinityCore/TrinityCore/commit/69663cc94f8b90daa5f19192313d4c4129ba64cc)
This commit is contained in:
@@ -1462,15 +1462,15 @@ namespace Game.Entities
|
|||||||
if (o == 0.0f)
|
if (o == 0.0f)
|
||||||
o = GetOrientation();
|
o = GetOrientation();
|
||||||
|
|
||||||
return SummonCreature(entry, new Position(x, y, z, o), despawnType, despawnTime, 0, privateObjectOwner);
|
return SummonCreature(entry, new Position(x, y, z, o), despawnType, despawnTime, 0, 0, privateObjectOwner);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TempSummon SummonCreature(uint entry, Position pos, TempSummonType despawnType = TempSummonType.ManualDespawn, uint despawnTime = 0, uint vehId = 0, ObjectGuid privateObjectOwner = default)
|
public TempSummon SummonCreature(uint entry, Position pos, TempSummonType despawnType = TempSummonType.ManualDespawn, uint despawnTime = 0, uint vehId = 0, uint spellId = 0, ObjectGuid privateObjectOwner = default)
|
||||||
{
|
{
|
||||||
Map map = GetMap();
|
Map map = GetMap();
|
||||||
if (map != null)
|
if (map != null)
|
||||||
{
|
{
|
||||||
TempSummon summon = map.SummonCreature(entry, pos, null, despawnTime, ToUnit(), 0, vehId, privateObjectOwner);
|
TempSummon summon = map.SummonCreature(entry, pos, null, despawnTime, ToUnit(), spellId, vehId, privateObjectOwner);
|
||||||
if (summon != null)
|
if (summon != null)
|
||||||
{
|
{
|
||||||
summon.SetTempSummonType(despawnType);
|
summon.SetTempSummonType(despawnType);
|
||||||
|
|||||||
@@ -1709,7 +1709,7 @@ namespace Game.Spells
|
|||||||
// randomize position for multiple summons
|
// randomize position for multiple summons
|
||||||
pos = caster.GetRandomPoint(destTarget, radius);
|
pos = caster.GetRandomPoint(destTarget, radius);
|
||||||
|
|
||||||
summon = caster.SummonCreature(entry, pos, summonType, (uint)duration, 0, privateObjectOwner);
|
summon = caster.SummonCreature(entry, pos, summonType, (uint)duration, 0, m_spellInfo.Id, privateObjectOwner);
|
||||||
if (summon == null)
|
if (summon == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -1717,7 +1717,6 @@ namespace Game.Spells
|
|||||||
{
|
{
|
||||||
summon.SetOwnerGUID(caster.GetGUID());
|
summon.SetOwnerGUID(caster.GetGUID());
|
||||||
summon.SetFaction(caster.GetFaction());
|
summon.SetFaction(caster.GetFaction());
|
||||||
summon.SetCreatedBySpell(m_spellInfo.Id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ExecuteLogEffectSummonObject(effectInfo.Effect, summon);
|
ExecuteLogEffectSummonObject(effectInfo.Effect, summon);
|
||||||
|
|||||||
Reference in New Issue
Block a user