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

Misc fixes

Browse Source
This commit is contained in:
hondacrx
2020-08-20 23:21:53 -04:00
parent 35e28da605
commit 062eecf20b
6 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Pets.cs
-1
View File
@@ -21,7 +21,6 @@ using Game.Networking.Packets;
using Game.Spells;
using System.Collections.Generic;
using System.Linq;
using Framework.Constants;
namespace Game.Entities
{
Source/Game/Maps/Map.cs
+2 -2
View File
@@ -2206,10 +2206,10 @@ namespace Game.Maps
public bool IsInLineOfSight(PhaseShift phaseShift, float x1, float y1, float z1, float x2, float y2, float z2, LineOfSightChecks checks, ModelIgnoreFlags ignoreFlags)
{
if (checks.HasAnyFlag(LineOfSightChecks.Vmap) && Global.VMapMgr.IsInLineOfSight(PhasingHandler.GetTerrainMapId(phaseShift, this, x1, y1), x1, y1, z1, x2, y2, z2, ignoreFlags))
if (checks.HasAnyFlag(LineOfSightChecks.Vmap) && !Global.VMapMgr.IsInLineOfSight(PhasingHandler.GetTerrainMapId(phaseShift, this, x1, y1), x1, y1, z1, x2, y2, z2, ignoreFlags))
return false;
if (WorldConfig.GetBoolValue(WorldCfg.CheckGobjectLos) && checks.HasAnyFlag(LineOfSightChecks.Gobject) && _dynamicTree.IsInLineOfSight(new Vector3(x1, y1, z1), new Vector3(x2, y2, z2), phaseShift))
if (WorldConfig.GetBoolValue(WorldCfg.CheckGobjectLos) && checks.HasAnyFlag(LineOfSightChecks.Gobject) && !_dynamicTree.IsInLineOfSight(new Vector3(x1, y1, z1), new Vector3(x2, y2, z2), phaseShift))
return false;
return true;
Source/Game/Networking/Packets/AuthenticationPackets.cs
-1
View File
@@ -316,7 +316,6 @@ namespace Game.Networking.Packets
public byte[] IPv4;
public byte[] IPv6;
public string NameSocket;
}
public enum AddressType
Source/Game/Spells/SpellInfo.cs
+4 -5
View File
@@ -3140,8 +3140,8 @@ namespace Game.Spells
if (effect == null || !effect.IsEffect())
continue;
targetMask |= effect.TargetA.GetExplicitTargetMask(srcSet, dstSet);
targetMask |= effect.TargetB.GetExplicitTargetMask(srcSet, dstSet);
targetMask |= effect.TargetA.GetExplicitTargetMask(ref srcSet, ref dstSet);
targetMask |= effect.TargetB.GetExplicitTargetMask(ref srcSet, ref dstSet);
// add explicit target flags based on spell effects which have SpellEffectImplicitTargetTypes.Explicit and no valid target provided
if (effect.GetImplicitTargetType() != SpellEffectImplicitTargetTypes.Explicit)
@@ -3723,8 +3723,7 @@ namespace Game.Spells
public int CalcValue(Unit caster = null, int? bp = null, Unit target = null, uint castItemId = 0, int itemLevel = -1)
{
float throwAway;
return CalcValue(out throwAway, caster, bp, target, castItemId, itemLevel);
return CalcValue(out _, caster, bp, target, castItemId, itemLevel);
}
public int CalcValue(out float variance, Unit caster = null, int? bp = null, Unit target = null, uint castItemId = 0, int itemLevel = -1)
@@ -4474,7 +4473,7 @@ namespace Game.Spells
return _target;
}
public SpellCastTargetFlags GetExplicitTargetMask(bool srcSet, bool dstSet)
public SpellCastTargetFlags GetExplicitTargetMask(ref bool srcSet, ref bool dstSet)
{
SpellCastTargetFlags targetMask = 0;
if (GetTarget() == Targets.DestTraj)