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

Fixes error with null map when unloading transports

Browse Source
This commit is contained in:
hondacrx
2017-07-08 23:29:09 -04:00
parent 7264fefd31
commit bdc66501d8
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Entities/Transport.cs
+17 -6
View File
@@ -252,9 +252,14 @@ namespace Game.Entities
3. transport moves from active to inactive grid
4. the grid that transport is currently in unloads
*/
if (_staticPassengers.Empty() && GetMap().IsGridLoaded(GetPositionX(), GetPositionY())) // 2.
bool gridActive = GetMap().IsGridLoaded(GetPositionX(), GetPositionY());
if (_staticPassengers.Empty() && gridActive) // 2.
LoadStaticPassengers();
else if (!_staticPassengers.Empty() && !gridActive)
// 4. - if transports stopped on grid edge, some passengers can remain in active grids
// unload all static passengers otherwise passengers won't load correctly when the grid that transport is currently in becomes active
UnloadStaticPassengers();
}
}
@@ -284,10 +289,17 @@ namespace Game.Entities
public void RemovePassenger(WorldObject passenger)
{
_passengers.Remove(passenger);
bool erased = _passengers.Remove(passenger);
if (passenger.IsTypeId(TypeId.Player))
Global.ScriptMgr.OnRemovePassenger(this, passenger.ToPlayer());
if (erased || _staticPassengers.Remove(passenger))
{
passenger.SetTransport(null);
passenger.m_movementInfo.transport.Reset();
Log.outDebug(LogFilter.Transport, "Object {0} removed from transport {1}.", passenger.GetName(), GetName());
if (passenger.IsTypeId(TypeId.Player))
Global.ScriptMgr.OnRemovePassenger(this, passenger.ToPlayer());
}
}
public Creature CreateNPCPassenger(ulong guid, CreatureData data)
@@ -547,7 +559,6 @@ namespace Game.Entities
while (!_staticPassengers.Empty())
{
WorldObject obj = _staticPassengers.First();
_staticPassengers.RemoveAt(0);
obj.AddObjectToRemoveList(); // also removes from _staticPassengers
}
}