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

Misc cleanups

Browse Source
This commit is contained in:
hondacrx
2022-03-02 17:34:33 -05:00
parent 37b805aebe
commit e839f2234c
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+1 -1
View File
@@ -1740,7 +1740,7 @@ namespace Game.Entities
if (!_IsTargetAcceptable(who))
return false;
if (!force && (IsNeutralToAll() || !IsWithinDistInMap(who, GetAttackDistance(who) + m_CombatDistance)))
if (IsNeutralToAll() || !IsWithinDistInMap(who, GetAttackDistance(who) + m_CombatDistance))
return false;
}
Source/Game/Entities/Object/WorldObject.cs
+1 -1
View File
@@ -2638,7 +2638,7 @@ namespace Game.Entities
// can't assist player out of sanctuary from sanctuary if has pvp enabled
if (unitTarget.IsPvP())
if (unit != null && unit.IsInSanctuary() && !unitTarget.IsInSanctuary())
if (unit.IsInSanctuary() && !unitTarget.IsInSanctuary())
return false;
}
}
Source/Game/Entities/Player/Player.Combat.cs
+1 -1
View File
@@ -619,7 +619,7 @@ namespace Game.Entities
if (pvpInfo.EndTimer == 0 || (currTime < pvpInfo.EndTimer + 300) || pvpInfo.IsHostile)
return;
if (pvpInfo.EndTimer != 0 && pvpInfo.EndTimer <= currTime)
if (pvpInfo.EndTimer <= currTime)
{
pvpInfo.EndTimer = 0;
RemovePlayerFlag(PlayerFlags.PVPTimer);
Source/Game/Entities/Unit/Unit.Pets.cs
+1 -1
View File
@@ -443,7 +443,7 @@ namespace Game.Entities
CharmType type;
if (HasUnitState(UnitState.Possessed))
type = CharmType.Possess;
else if (charmer && charmer.IsOnVehicle(this))
else if (charmer.IsOnVehicle(this))
type = CharmType.Vehicle;
else
type = CharmType.Charm;