From 293b3381065b64f5ad7b7e7b32c38c6f66707072 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 11 Jan 2018 14:21:19 -0500 Subject: [PATCH] Core/Misc: Misc fixes/Cleanups --- Source/Game/Entities/Creature/Creature.cs | 2 +- Source/Game/Entities/Unit/Unit.Combat.cs | 2 +- Source/Game/Entities/Unit/Unit.cs | 2 +- Source/Game/Movement/Generators/RandomMovement.cs | 3 --- Source/Game/Network/Packets/LFGPackets.cs | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 8ad7432a5..bbb37acd5 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -2974,7 +2974,7 @@ namespace Game.Entities public void SetTransportHomePosition(float x, float y, float z, float o) { m_transportHomePosition.Relocate(x, y, z, o); } public void SetTransportHomePosition(Position pos) { m_transportHomePosition.Relocate(pos); } public void GetTransportHomePosition(out float x, out float y, out float z, out float ori) { m_transportHomePosition.GetPosition(out x, out y, out z, out ori); } - Position GetTransportHomePosition() { return m_transportHomePosition; } + public Position GetTransportHomePosition() { return m_transportHomePosition; } public uint GetWaypointPath() { return m_path_id; } public void LoadPath(uint pathid) { m_path_id = pathid; } diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 72b08632c..67f33160d 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -2277,7 +2277,7 @@ namespace Game.Entities if (victimResistance <= 0) return 0; - float averageResist = victimResistance / victimResistance + resistanceConstant; + float averageResist = (float)victimResistance / (float)(victimResistance + resistanceConstant); float[] discreteResistProbability = new float[11]; for (uint i = 0; i < 11; ++i) diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index 82c98dc62..c7bd8f05f 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -2393,7 +2393,7 @@ namespace Game.Entities return 0; } - public bool IsStopped() { return !(HasUnitState(UnitState.Moving)); } + public bool IsStopped() { return !HasUnitState(UnitState.Moving); } public bool HasUnitTypeMask(UnitTypeMask mask) { return Convert.ToBoolean(mask & m_unitTypeMask); } public void AddUnitTypeMask(UnitTypeMask mask) { m_unitTypeMask |= mask; } diff --git a/Source/Game/Movement/Generators/RandomMovement.cs b/Source/Game/Movement/Generators/RandomMovement.cs index b2185a28f..0e6f8bfc7 100644 --- a/Source/Game/Movement/Generators/RandomMovement.cs +++ b/Source/Game/Movement/Generators/RandomMovement.cs @@ -160,10 +160,7 @@ namespace Game.Movement } creature.AddUnitState(UnitState.RoamingMove); - if (destZ < 25f) - { - } MoveSplineInit init = new MoveSplineInit(creature); init.MoveTo(destX, destY, destZ); init.SetWalk(true); diff --git a/Source/Game/Network/Packets/LFGPackets.cs b/Source/Game/Network/Packets/LFGPackets.cs index 288118f81..4c6092683 100644 --- a/Source/Game/Network/Packets/LFGPackets.cs +++ b/Source/Game/Network/Packets/LFGPackets.cs @@ -276,7 +276,7 @@ namespace Game.Network.Packets blackList.Write(_worldPacket); } - public RideTicket Ticket; + public RideTicket Ticket = new RideTicket(); public byte Result; public byte ResultDetail; public List BlackList = new List();