Misc fixes
This commit is contained in:
@@ -659,7 +659,6 @@ namespace Game.Combat
|
|||||||
void fillSharedPacketDataAndSend(dynamic packet)
|
void fillSharedPacketDataAndSend(dynamic packet)
|
||||||
{
|
{
|
||||||
packet.UnitGUID = _owner.GetGUID();
|
packet.UnitGUID = _owner.GetGUID();
|
||||||
packet.ThreatList.reserve(_sortedThreatList.Count);
|
|
||||||
|
|
||||||
foreach (ThreatReference refe in _sortedThreatList)
|
foreach (ThreatReference refe in _sortedThreatList)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1106,7 +1106,7 @@ namespace Game
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
Log.outError(LogFilter.Sql, $"{cond.ToString()} Invalid ConditionSourceType in `condition` table, ignoring.");
|
Log.outError(LogFilter.Sql, $"{cond.ToString()} Invalid ConditionSourceType in `condition` table, ignoring.");
|
||||||
break;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -467,8 +467,8 @@ namespace Game.Entities
|
|||||||
if (IsCharmed())
|
if (IsCharmed())
|
||||||
RemoveCharmedBy(null);
|
RemoveCharmedBy(null);
|
||||||
|
|
||||||
Cypher.Assert(!GetCharmedGUID().IsEmpty(), $"Unit {GetEntry()} has charmed guid when removed from world");
|
Cypher.Assert(GetCharmedGUID().IsEmpty(), $"Unit {GetEntry()} has charmed guid when removed from world");
|
||||||
Cypher.Assert(!GetCharmerGUID().IsEmpty(), $"Unit {GetEntry()} has charmer guid when removed from world");
|
Cypher.Assert(GetCharmerGUID().IsEmpty(), $"Unit {GetEntry()} has charmer guid when removed from world");
|
||||||
|
|
||||||
Unit owner = GetOwner();
|
Unit owner = GetOwner();
|
||||||
if (owner != null)
|
if (owner != null)
|
||||||
|
|||||||
@@ -5558,7 +5558,7 @@ namespace Game.Maps
|
|||||||
|
|
||||||
public uint AreaId;
|
public uint AreaId;
|
||||||
public float FloorZ;
|
public float FloorZ;
|
||||||
public bool outdoors;
|
public bool outdoors = true;
|
||||||
public ZLiquidStatus LiquidStatus;
|
public ZLiquidStatus LiquidStatus;
|
||||||
public Optional<AreaInfo> areaInfo;
|
public Optional<AreaInfo> areaInfo;
|
||||||
public Optional<LiquidData> LiquidInfo;
|
public Optional<LiquidData> LiquidInfo;
|
||||||
|
|||||||
@@ -578,7 +578,7 @@ namespace Game.Networking.Packets
|
|||||||
|
|
||||||
public override void Read()
|
public override void Read()
|
||||||
{
|
{
|
||||||
RankID = _worldPacket.ReadInt32();
|
RankID = _worldPacket.ReadUInt8();
|
||||||
RankOrder = _worldPacket.ReadInt32();
|
RankOrder = _worldPacket.ReadInt32();
|
||||||
Flags = _worldPacket.ReadUInt32();
|
Flags = _worldPacket.ReadUInt32();
|
||||||
WithdrawGoldLimit = _worldPacket.ReadUInt32();
|
WithdrawGoldLimit = _worldPacket.ReadUInt32();
|
||||||
@@ -597,7 +597,7 @@ namespace Game.Networking.Packets
|
|||||||
OldFlags = _worldPacket.ReadUInt32();
|
OldFlags = _worldPacket.ReadUInt32();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int RankID;
|
public byte RankID;
|
||||||
public int RankOrder;
|
public int RankOrder;
|
||||||
public uint WithdrawGoldLimit;
|
public uint WithdrawGoldLimit;
|
||||||
public uint Flags;
|
public uint Flags;
|
||||||
|
|||||||
@@ -210,47 +210,6 @@ namespace Scripts.World.Areatriggers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Script]
|
|
||||||
class AreaTrigger_at_last_rites : AreaTriggerScript
|
|
||||||
{
|
|
||||||
public AreaTrigger_at_last_rites() : base("at_last_rites") { }
|
|
||||||
|
|
||||||
public override bool OnTrigger(Player player, AreaTriggerRecord areaTrigger, bool entered)
|
|
||||||
{
|
|
||||||
if (!(player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Incomplete ||
|
|
||||||
player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Complete ||
|
|
||||||
player.GetQuestStatus(QuestIds.BreakingThrough) == QuestStatus.Incomplete ||
|
|
||||||
player.GetQuestStatus(QuestIds.BreakingThrough) == QuestStatus.Complete))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
WorldLocation pPosition;
|
|
||||||
|
|
||||||
switch (areaTrigger.Id)
|
|
||||||
{
|
|
||||||
case 5332:
|
|
||||||
case 5338:
|
|
||||||
pPosition = new WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f);
|
|
||||||
break;
|
|
||||||
case 5334:
|
|
||||||
pPosition = new WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f);
|
|
||||||
break;
|
|
||||||
case 5340:
|
|
||||||
if (player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Incomplete ||
|
|
||||||
player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Complete)
|
|
||||||
pPosition = new WorldLocation(571, 3687.91f, 3577.28f, 473.342f);
|
|
||||||
else
|
|
||||||
pPosition = new WorldLocation(571, 3739.38f, 3567.09f, 341.58f);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
player.TeleportTo(pPosition);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[Script]
|
[Script]
|
||||||
class AreaTrigger_at_sholazar_waygate : AreaTriggerScript
|
class AreaTrigger_at_sholazar_waygate : AreaTriggerScript
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user