Skip to content

Commit bada222

Browse files
authored
fix: client DC when empty Input Variable event is sent (#2781)
Fixes #2765
1 parent 4cb52ce commit bada222

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Intersect.Server.Core/Entities/Player.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6980,8 +6980,9 @@ public void RespondToEventInput(Guid eventId, bool newValueBool, int newValue, s
69806980

69816981
break;
69826982
case VariableDataType.String:
6983-
if (newValueString.Length >= cmd.Minimum &&
6984-
newValueString.Length <= cmd.Maximum)
6983+
var stringValue = newValueString ?? string.Empty;
6984+
var stringLength = stringValue.Length;
6985+
if (stringLength >= cmd.Minimum && stringLength <= cmd.Maximum)
69856986
{
69866987
if (value.String != newValueString)
69876988
{

Intersect.Server.Core/Networking/PacketHandler.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,11 +1468,13 @@ public void HandlePacket(Client client, EventResponsePacket packet)
14681468
//EventInputVariablePacket
14691469
public void HandlePacket(Client client, EventInputVariablePacket packet)
14701470
{
1471-
client.Entity.RespondToEventInput(
1471+
var player = client?.Entity;
1472+
1473+
player?.RespondToEventInput(
14721474
packet.EventId,
14731475
packet.BooleanValue,
14741476
packet.Value,
1475-
packet.StringValue,
1477+
packet.StringValue ?? string.Empty,
14761478
packet.Canceled
14771479
);
14781480
}

0 commit comments

Comments
 (0)