Misc fixes

This commit is contained in:
hondacrx
2022-02-23 16:28:45 -05:00
parent bbc0c07697
commit 99b4a7ea8b
9 changed files with 33 additions and 293 deletions
@@ -1629,6 +1629,12 @@ namespace Game.BattleGrounds
// buffs are in their positions when Battleground starts
public void HandleTriggerBuff(ObjectGuid goGuid)
{
if (!FindBgMap())
{
Log.outError(LogFilter.Battleground, $"Battleground::HandleTriggerBuff called with null bg map, {goGuid}");
return;
}
GameObject obj = GetBgMap().GetGameObject(goGuid);
if (!obj || obj.GetGoType() != GameObjectTypes.Trap || !obj.IsSpawned())
return;
@@ -288,7 +288,7 @@ namespace Game.Entities
float angle = pair.Value.FollowAngle + MathF.PI; // for some reason, someone thought it was a great idea to invert relativ angles...
float dist = pair.Value.FollowDist;
if (!member.HasUnitState(UnitState.Formation))
if (!member.HasUnitState(UnitState.FollowFormation))
member.GetMotionMaster().MoveFormation(_leader, dist, angle, pair.Value.LeaderWaypointIDs[0], pair.Value.LeaderWaypointIDs[1]);
}
}
+5
View File
@@ -2823,6 +2823,11 @@ namespace Game
}
cInfo.ModDamage *= Creature._GetDamageMod(cInfo.Rank);
if (cInfo.GossipMenuId != 0 && !cInfo.Npcflag.HasAnyFlag((ulong)NPCFlags.Gossip))
Log.outInfo(LogFilter.Sql, $"Creature (Entry: {cInfo.Entry}) has assigned gossip menu {cInfo.GossipMenuId}, but npcflag does not include UNIT_NPC_FLAG_GOSSIP.");
else if (cInfo.GossipMenuId == 0 && cInfo.Npcflag.HasAnyFlag((ulong)NPCFlags.Gossip))
Log.outInfo(LogFilter.Sql, $"Creature (Entry: {cInfo.Entry}) has npcflag UNIT_NPC_FLAG_GOSSIP, but gossip menu is unassigned.");
}
void CheckCreatureMovement(string table, ulong id, CreatureMovementData creatureMovement)
{
+1 -1
View File
@@ -5121,7 +5121,7 @@ namespace Game.Maps
public delegate void FarSpellCallback(Map map);
Queue<FarSpellCallback> _farSpellCallbacks = new();
MultiPersonalPhaseTracker _multiPersonalPhaseTracker;
MultiPersonalPhaseTracker _multiPersonalPhaseTracker = new();
#endregion
}
+18
View File
@@ -1710,6 +1710,24 @@ namespace Game.Spells
switch (SpellFamilyName)
{
case SpellFamilyNames.Generic:
// Frost Tomb
if (Id == 48400)
return DiminishingGroup.None;
// Gnaw
else if (Id == 47481)
return DiminishingGroup.Stun;
// ToC Icehowl Arctic Breath
else if (Id == 66689)
return DiminishingGroup.None;
// Black Plague
else if (Id == 64155)
return DiminishingGroup.None;
// Screams of the Dead (King Ymiron)
else if (Id == 51750)
return DiminishingGroup.None;
// Crystallize (Keristrasza heroic)
else if (Id == 48179)
return DiminishingGroup.None;
break;
case SpellFamilyNames.Mage:
{