Fixed a exception when selecting new exiles reach starting zone, would never remove the person from the transport. Also fixes crash when selecting first quest for alliance.
This commit is contained in:
@@ -127,7 +127,7 @@ namespace Game.DataStorage
|
|||||||
conversationTemplate.TextureKitId = templateResult.Read<uint>(2);
|
conversationTemplate.TextureKitId = templateResult.Read<uint>(2);
|
||||||
conversationTemplate.ScriptId = Global.ObjectMgr.GetScriptId(templateResult.Read<string>(3));
|
conversationTemplate.ScriptId = Global.ObjectMgr.GetScriptId(templateResult.Read<string>(3));
|
||||||
|
|
||||||
conversationTemplate.Actors = actorsByConversation.TryGetValue(conversationTemplate.Id, out var actors) ? actors.ToList() : null;
|
conversationTemplate.Actors = actorsByConversation.TryGetValue(conversationTemplate.Id, out var actors) ? actors.ToList() : new();
|
||||||
|
|
||||||
uint correctedFirstLineId = getFirstLineIdFromAnyLineId(conversationTemplate.FirstLineId);
|
uint correctedFirstLineId = getFirstLineIdFromAnyLineId(conversationTemplate.FirstLineId);
|
||||||
if (conversationTemplate.FirstLineId != correctedFirstLineId)
|
if (conversationTemplate.FirstLineId != correctedFirstLineId)
|
||||||
|
|||||||
@@ -692,9 +692,6 @@ namespace Game.Entities
|
|||||||
DuelComplete(DuelCompleteType.Interrupted);
|
DuelComplete(DuelCompleteType.Interrupted);
|
||||||
|
|
||||||
base.CleanupsBeforeDelete(finalCleanup);
|
base.CleanupsBeforeDelete(finalCleanup);
|
||||||
|
|
||||||
if (GetTransport() != null)
|
|
||||||
GetTransport().RemovePassenger(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void AddToWorld()
|
public override void AddToWorld()
|
||||||
|
|||||||
@@ -616,6 +616,7 @@ namespace Game
|
|||||||
else
|
else
|
||||||
SendCharCreate(ResponseCodes.CharCreateError);
|
SendCharCreate(ResponseCodes.CharCreateError);
|
||||||
|
|
||||||
|
newChar.CleanupsBeforeDelete();
|
||||||
newChar.Dispose();
|
newChar.Dispose();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user