From 621ce865b73f0d41fc9fa5c7c12b7ff73a74fc0f Mon Sep 17 00:00:00 2001
From: Aru <17498701+Arufonsu@users.noreply.github.com>
Date: Sun, 21 Dec 2025 14:06:53 -0300
Subject: [PATCH] fix: Client disconnects when Input Variable event command is
 submitted empty

Fixes #2765
---
 Intersect.Server.Core/Entities/Player.cs          | 5 +++--
 Intersect.Server.Core/Networking/PacketHandler.cs | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Intersect.Server.Core/Entities/Player.cs b/Intersect.Server.Core/Entities/Player.cs
index 61e9933670..54c789b863 100644
--- a/Intersect.Server.Core/Entities/Player.cs
+++ b/Intersect.Server.Core/Entities/Player.cs
@@ -6980,8 +6980,9 @@ public void RespondToEventInput(Guid eventId, bool newValueBool, int newValue, s
 
                                     break;
                                 case VariableDataType.String:
-                                    if (newValueString.Length >= cmd.Minimum &&
-                                        newValueString.Length <= cmd.Maximum)
+                                    var stringValue = newValueString ?? string.Empty;
+                                    var stringLength = stringValue.Length;
+                                    if (stringLength >= cmd.Minimum && stringLength <= cmd.Maximum)
                                     {
                                         if (value.String != newValueString)
                                         {
diff --git a/Intersect.Server.Core/Networking/PacketHandler.cs b/Intersect.Server.Core/Networking/PacketHandler.cs
index 91ebc17b49..b2d4a1e8f4 100644
--- a/Intersect.Server.Core/Networking/PacketHandler.cs
+++ b/Intersect.Server.Core/Networking/PacketHandler.cs
@@ -1468,11 +1468,13 @@ public void HandlePacket(Client client, EventResponsePacket packet)
     //EventInputVariablePacket
     public void HandlePacket(Client client, EventInputVariablePacket packet)
     {
-        client.Entity.RespondToEventInput(
+        var player = client?.Entity;
+
+        player?.RespondToEventInput(
             packet.EventId,
             packet.BooleanValue,
             packet.Value,
-            packet.StringValue,
+            packet.StringValue ?? string.Empty,
             packet.Canceled
         );
     }