From 3290fcbdef82032f7a22dcccbc426078a19e2bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= <zaklaus@outlook.com>
Date: Fri, 21 Jun 2024 15:21:22 +0200
Subject: [PATCH] safety

---
 src/NeedsSystem.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/NeedsSystem.cpp b/src/NeedsSystem.cpp
index b8bc53e..378e0b8 100644
--- a/src/NeedsSystem.cpp
+++ b/src/NeedsSystem.cpp
@@ -106,7 +106,7 @@ public:
 
     void OnLogin(Player* player) override
     {
-        if (player->GetSession()->IsBot())
+        if (!player->GetSession() || player->GetSession()->IsBot())
         {
             return;
         }
@@ -129,7 +129,7 @@ public:
 
     void SaveData(Player* player)
     {
-        if (player->GetSession()->IsBot())
+        if (!player->GetSession() || player->GetSession()->IsBot())
         {
             return;
         }
@@ -188,7 +188,12 @@ public:
 
     void OnSpellCast(Player* player, Spell* spell, bool /*skipCheck*/) override
     {
-        if (!NeedsEnabled || !spell->m_CastItem || player->GetSession()->IsBot())
+        if (!NeedsEnabled || !player || !player->GetSession())
+        {
+            return;
+        }
+
+        if (!spell->m_CastItem || player->GetSession()->IsBot())
         {
             return;
         }
@@ -225,7 +230,7 @@ public:
 
     void OnBeforeUpdate(Player* player, uint32 /* p_time */) override
     {
-        if (!NeedsEnabled || !player->IsInWorld() || !player->IsAlive() || player->GetSession()->IsBot())
+        if (!NeedsEnabled || !player->IsInWorld() || !player->IsAlive() || !player->GetSession() || player->GetSession()->IsBot())
         {
             return;
         }