diff --git a/Game.Client/C_BaseAnimating.cs b/Game.Client/C_BaseAnimating.cs index 557e7c9a..0df4f952 100644 --- a/Game.Client/C_BaseAnimating.cs +++ b/Game.Client/C_BaseAnimating.cs @@ -113,6 +113,13 @@ public override void ResetLatched() { } public override bool IsRagdoll() => Ragdoll != null && RenderFX == (byte)RenderFx.Ragdoll; + public override CollideType GetCollideType() { + if (IsRagdoll()) + return CollideType.ShouldRespond; + + return base.GetCollideType(); + } + public override ShadowType ShadowCastType() { StudioHdr? studioHdr = GetModelPtr(); if (studioHdr == null || !studioHdr.SequencesAvailable()) diff --git a/Game.Client/C_BaseEntity.cs b/Game.Client/C_BaseEntity.cs index 91e3b47a..ce7b5a63 100644 --- a/Game.Client/C_BaseEntity.cs +++ b/Game.Client/C_BaseEntity.cs @@ -2172,6 +2172,14 @@ public virtual void NotifyShouldTransmit(ShouldTransmiteState state) { if (EntIndex() < 0) return; +#if GMOD_DLL + if (g_Lua != null && gGM != null && gGM.CallWithArgs((int)LUA_POOLEDSTRING.NotifyShouldTransmit)) { + GarrysMod.LuaEntity.Push_Entity(this); + g_Lua.PushBool(state == ShouldTransmiteState.Start); + gGM.CallNoReturns(2); + } +#endif + switch (state) { case ShouldTransmiteState.Start: { SetDormant(false); @@ -2200,6 +2208,8 @@ public virtual void NotifyShouldTransmit(ShouldTransmiteState state) { case ShouldTransmiteState.End: { UnlinkFromHierarchy(); SetDormant(true); + + partition.Remove(PartitionListMask.ClientSolidEdicts | PartitionListMask.ClientResponsiveEdicts | PartitionListMask.ClientNonStaticEdicts, CollisionProp().GetPartitionHandle()); } break; diff --git a/Game.Client/C_World.cs b/Game.Client/C_World.cs index 686de6d8..af24e089 100644 --- a/Game.Client/C_World.cs +++ b/Game.Client/C_World.cs @@ -21,6 +21,8 @@ public C_World() : base() { } + public override CollideType GetCollideType() => CollideType.ShouldNotCollide; + [NetworkTable] public static readonly new NetworkProp[] Props = [ nameof(WorldMins),