Skip to content

Commit ee834c9

Browse files
authored
Merge pull request #25 from tslashd/dev
Remove Collision code from plugin
2 parents ce00b8c + 76854f7 commit ee834c9

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

cfg/SurfTimer/server_settings.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ bot_freeze 1
4242
mp_spectators_max 64
4343
mp_humanteam ct
4444
mp_disconnect_kills_players 1
45+
mp_solid_enemies 0
4546
mp_solid_teammates 0
4647
mp_respawn_on_death_ct 1
4748
mp_respawn_on_death_t 1

src/ST-Events/Tick.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public void OnTick()
1515
player.Timer.Tick();
1616
player.ReplayRecorder.Tick(player);
1717
player.HUD.Display();
18-
if (player.Controller.Collision == null) continue;
19-
if ((CollisionGroup)player.Controller.Collision.CollisionGroup == CollisionGroup.COLLISION_GROUP_DEBRIS) continue;
20-
player.Controller.SetCollisionGroup(CollisionGroup.COLLISION_GROUP_DEBRIS);
2118
}
2219

2320
// Need to disable maps from executing their cfgs. Currently idk how (But seriusly it a security issue)

src/ST-UTILS/Extensions.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,6 @@ 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-
5948
/// <summary>
6049
/// Checks whether an IP is a local one. Allows testing the plugin in a local environment setup for GeoIP
6150
/// </summary>

0 commit comments

Comments
 (0)