From 441c5864002034b5ef1d40eb617708b652c2e74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Fri, 16 Oct 2026 00:19:42 +0300 Subject: [PATCH] Fix func_brush ignoring excludednpc and invert_exclusion --- Game.Server/ModelEntities.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Game.Server/ModelEntities.cs b/Game.Server/ModelEntities.cs index 2406ac41d..465b258fd 100644 --- a/Game.Server/ModelEntities.cs +++ b/Game.Server/ModelEntities.cs @@ -27,6 +27,11 @@ public enum BrushSolidities DEFINE.KEYFIELD(nameof(Disabled), FieldType.Integer, "StartDisabled"), DEFINE.KEYFIELD(nameof(Solidity), FieldType.Integer, "Solidity"), DEFINE.KEYFIELD(nameof(SolidBsp), FieldType.Boolean, "solidbsp"), + DEFINE.KEYFIELD(nameof(ExcludedClass), FieldType.String, "excludednpc"), + DEFINE.KEYFIELD(nameof(InvertExclusion), FieldType.Boolean, "invert_exclusion"), + + DEFINE.INPUTFUNC(FieldType.String, "SetExcluded", nameof(InputSetExcluded), (INPUTFUNCPTR)((self, data) => ((FuncBrush)self).InputSetExcluded(data))), + DEFINE.INPUTFUNC(FieldType.Boolean, "SetInvert", nameof(InputSetInvert), (INPUTFUNCPTR)((self, data) => ((FuncBrush)self).InputSetInvert(data))), ]); public override DataMap? GetDataDescMap() => DataDesc; @@ -64,6 +69,10 @@ public bool CreateVPhysics() { return true; } + public void InputSetExcluded(InputData inputdata) => ExcludedClass = inputdata.Value.StringID(); + + public void InputSetInvert(InputData inputdata) => InvertExclusion = inputdata.Value.Bool(); + public void TurnOff() { if (!IsOn()) return;