From f8a5e9e7a510672775eecbeb03e6a933910ff79e Mon Sep 17 00:00:00 2001
From: NotKappa <plsfixrito@users.noreply.github.com>
Date: Wed, 8 Feb 2023 21:50:03 +0300
Subject: [PATCH] Apply suggestions

---
 Core/NosSmooth.Game/Events/Map/MapChangedEvent.cs       | 2 +-
 Core/NosSmooth.Game/PacketHandlers/Map/CMapResponder.cs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Core/NosSmooth.Game/Events/Map/MapChangedEvent.cs b/Core/NosSmooth.Game/Events/Map/MapChangedEvent.cs
index 7ebd8ca22392cf1d6831a1a0201cf7ae39ba1392..f34203589ea8d883cd9df1df5ea4f5a36b6955b4 100644
--- a/Core/NosSmooth.Game/Events/Map/MapChangedEvent.cs
+++ b/Core/NosSmooth.Game/Events/Map/MapChangedEvent.cs
@@ -14,5 +14,5 @@ namespace NosSmooth.Game.Events.Map;
 public record MapChangedEvent
 (
     Data.Maps.Map? PreviousMap,
-    Data.Maps.Map? CurrentMap
+    Data.Maps.Map CurrentMap
 ) : IGameEvent;
\ No newline at end of file
diff --git a/Core/NosSmooth.Game/PacketHandlers/Map/CMapResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Map/CMapResponder.cs
index b0052550597d30c9a2d6164dcc0a6365891f1df6..1af1051e9f533a0713d842e3e4c13e46fcef0119 100644
--- a/Core/NosSmooth.Game/PacketHandlers/Map/CMapResponder.cs
+++ b/Core/NosSmooth.Game/PacketHandlers/Map/CMapResponder.cs
@@ -97,6 +97,11 @@ public class CMapResponder : IPacketResponder<CMapPacket>
             ct: ct
         );
 
-        return await _eventDispatcher.DispatchEvent(new MapChangedEvent(previousMap, _game.CurrentMap), ct);
+        if (currentMap is not null)
+        {
+            return await _eventDispatcher.DispatchEvent(new MapChangedEvent(previousMap, currentMap), ct);
+        }
+
+        return Result.FromSuccess();
     }
 }
\ No newline at end of file