Skip to content

Commit 2447afa

Browse files
authored
Merge branch 'dev' into remove-player-collision
2 parents 11a2139 + aa0509d commit 2447afa

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

cfg/SurfTimer/server_settings.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ mp_spectators_max 64
4343
mp_humanteam ct
4444
mp_disconnect_kills_players 1
4545
mp_solid_teammates 0
46-
mp_solid_enemies 0
4746
mp_respawn_on_death_ct 1
4847
mp_respawn_on_death_t 1
4948
mp_ct_default_secondary weapon_usp_silencer

src/ST-UTILS/Extensions.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@ public static void Teleport(this CBaseEntity entity, VectorT? position = null, Q
4545
public static VectorT ToVector_t(this Vector vec) => new(vec.Handle);
4646
public static QAngleT ToQAngle_t(this QAngle vec) => new(vec.Handle);
4747

48+
public static void SetCollisionGroup(this CCSPlayerController controller, CollisionGroup collisionGroup)
49+
{
50+
if (!controller.IsValid || controller.Collision == null) return;
51+
controller.Collision.CollisionAttribute.CollisionGroup = (byte)collisionGroup;
52+
controller.Collision.CollisionGroup = (byte)collisionGroup;
53+
54+
Utilities.SetStateChanged(controller, "CColisionProperity", "m_collisionGroup");
55+
Utilities.SetStateChanged(controller, "CCollisionProperty", "m_collisionAttribute");
56+
}
57+
58+
4859
/// <summary>
4960
/// Checks whether an IP is a local one. Allows testing the plugin in a local environment setup for GeoIP
5061
/// </summary>

0 commit comments

Comments
 (0)