Skip to content

Fix func_brush ignoring excludednpc and invert_exclusion #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marchc1 merged 1 commit into from
Oct 15, 2026
Merged

Fix func_brush ignoring excludednpc and invert_exclusion #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Game.Server/ModelEntities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
Loading