From 0976986f550b2add8a3f909867719a63b58212a0 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 27 Feb 2023 01:08:19 -0500 Subject: [PATCH] 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. --- Source/Game/DataStorage/ConversationDataStorage.cs | 2 +- Source/Game/Entities/Player/Player.cs | 3 --- Source/Game/Handlers/CharacterHandler.cs | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Game/DataStorage/ConversationDataStorage.cs b/Source/Game/DataStorage/ConversationDataStorage.cs index a16aa09c6..6987d42fc 100644 --- a/Source/Game/DataStorage/ConversationDataStorage.cs +++ b/Source/Game/DataStorage/ConversationDataStorage.cs @@ -127,7 +127,7 @@ namespace Game.DataStorage conversationTemplate.TextureKitId = templateResult.Read(2); conversationTemplate.ScriptId = Global.ObjectMgr.GetScriptId(templateResult.Read(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); if (conversationTemplate.FirstLineId != correctedFirstLineId) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 022e8200b..bcbddb525 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -692,9 +692,6 @@ namespace Game.Entities DuelComplete(DuelCompleteType.Interrupted); base.CleanupsBeforeDelete(finalCleanup); - - if (GetTransport() != null) - GetTransport().RemovePassenger(this); } public override void AddToWorld() diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index 6dab68648..23469dc68 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -616,6 +616,7 @@ namespace Game else SendCharCreate(ResponseCodes.CharCreateError); + newChar.CleanupsBeforeDelete(); newChar.Dispose(); }); }