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

Core/Misc: Defined new summon properties titles

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3700e0ef5de95dc79290cd16b5abacdd0d490570)
This commit is contained in:
hondacrx
2020-04-25 00:30:04 -04:00
parent 0f1cbbb502
commit 9ee0d404b7
9 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/TemporarySummon.cs
+1 -1
View File
@@ -378,7 +378,7 @@ namespace Game.Entities
m_bonusSpellDamage = 0;
UnitTypeMask |= UnitTypeMask.Guardian;
if (properties != null && (properties.Title == SummonType.Pet || properties.Control == SummonCategory.Pet))
if (properties != null && (properties.Title == SummonTitle.Pet || properties.Control == SummonCategory.Pet))
{
UnitTypeMask |= UnitTypeMask.ControlableGuardian;
InitCharmInfo();
Source/Game/Entities/Transport.cs
+8 -8
View File
@@ -420,20 +420,20 @@ namespace Game.Entities
{
switch (properties.Title)
{
case SummonType.Minion:
case SummonType.Guardian:
case SummonType.Guardian2:
case SummonTitle.Minion:
case SummonTitle.Guardian:
case SummonTitle.Runeblade:
mask = UnitTypeMask.Guardian;
break;
case SummonType.Totem:
case SummonType.LightWell:
case SummonTitle.Totem:
case SummonTitle.LightWell:
mask = UnitTypeMask.Totem;
break;
case SummonType.Vehicle:
case SummonType.Vehicle2:
case SummonTitle.Vehicle:
case SummonTitle.Mount:
mask = UnitTypeMask.Summon;
break;
case SummonType.Minipet:
case SummonTitle.Companion:
mask = UnitTypeMask.Minion;
break;
default:
Source/Game/Entities/Unit/Unit.Pets.cs
+2 -2
View File
@@ -199,7 +199,7 @@ namespace Game.Entities
if (GetMinionGUID().IsEmpty())
SetMinionGUID(minion.GetGUID());
if (minion.m_Properties != null && minion.m_Properties.Title == SummonType.Minipet)
if (minion.m_Properties != null && minion.m_Properties.Title == SummonTitle.Companion)
{
SetCritterGUID(minion.GetGUID());
Player thisPlayer = ToPlayer();
@@ -230,7 +230,7 @@ namespace Game.Entities
m_Controlled.Remove(minion);
if (minion.m_Properties != null && minion.m_Properties.Title == SummonType.Minipet)
if (minion.m_Properties != null && minion.m_Properties.Title == SummonTitle.Companion)
{
if (GetCritterGUID() == minion.GetGUID())
SetCritterGUID(ObjectGuid.Empty);