From b5de805083f275fb90a7291db06ae313462d648d Mon Sep 17 00:00:00 2001 From: wrexbe <81056464+wrexbe@users.noreply.github.com> Date: Sat, 30 Jul 2022 21:23:46 -0700 Subject: [PATCH] Mouse disposal nullable patch (#10185) --- .../Disposal/Unit/EntitySystems/DisposalUnitSystem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index 1b1d766ed6..1b229bc3a4 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -189,7 +189,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems return; else unit.Container.Insert(toInsert); - + AfterInsert(unit, toInsert); } @@ -475,9 +475,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems if (!Resolve(unitId, ref unit)) return false; - if (!HasComp(userId) && toInsertId != userId) // Mobs like mouse can Jump inside even with no hands + if (userId.HasValue && !HasComp(userId) && toInsertId != userId) // Mobs like mouse can Jump inside even with no hands { - _popupSystem.PopupEntity(Loc.GetString("disposal-unit-no-hands"), userId, Filter.Entities(userId), PopupType.SmallCaution); + _popupSystem.PopupEntity(Loc.GetString("disposal-unit-no-hands"), userId.Value, Filter.Entities(userId.Value), PopupType.SmallCaution); return false; }