diff --git a/Source.Engine/DtEncode.cs b/Source.Engine/DtEncode.cs index eb6863e5..35c7aa9c 100644 --- a/Source.Engine/DtEncode.cs +++ b/Source.Engine/DtEncode.cs @@ -27,11 +27,6 @@ public void CopyVars(ref readonly DecodeInfo decodeInfo) { } } -public static class PackedEntitiesManager -{ - public static ReadOnlySpan GetObjectClassName(int objectID) => "[unknown]"; -} - public delegate void EncodeFn(object instance, ref DVariant var, SendProp prop, bf_write writeOut, int objectID); public delegate void DecodeFn(ref DecodeInfo info); public delegate int CompareDeltasFn(SendProp prop, bf_read p1, bf_read p2); @@ -87,13 +82,13 @@ public static void EncodeFloat(SendProp prop, float incoming, bf_write outBuffer val = 0; if ((flags & PropFlags.RoundUp) == 0) - Warning($"(class {PackedEntitiesManager.GetObjectClassName(objectID)}): Out-of-range value ({incoming} < {prop.LowValue}) in SendPropFloat '{prop.FieldInfo}', clamping.\n"); + Warning($"(class {Server.PackedEntities.GetObjectClassName(objectID)}): Out-of-range value ({incoming} < {prop.LowValue}) in SendPropFloat '{prop.GetName()}', clamping.\n"); } else if (incoming > prop.HighValue) { val = (uint)((1 << prop.Bits) - 1); if ((flags & PropFlags.RoundDown) == 0) - Warning($"(class {PackedEntitiesManager.GetObjectClassName(objectID)}): Out-of-range value ({incoming} > {prop.HighValue}) in SendPropFloat '{prop.FieldInfo}', clamping.\n"); + Warning($"(class {Server.PackedEntities.GetObjectClassName(objectID)}): Out-of-range value ({incoming} > {prop.HighValue}) in SendPropFloat '{prop.GetName()}', clamping.\n"); } else { float fRangeVal = (incoming - prop.LowValue) * prop.HighLowMul; diff --git a/Source.Engine/Server/PackedEntities.cs b/Source.Engine/Server/PackedEntities.cs index d9d739d0..e7766970 100644 --- a/Source.Engine/Server/PackedEntities.cs +++ b/Source.Engine/Server/PackedEntities.cs @@ -394,7 +394,10 @@ public static void WriteClassInfos(ServerClass clases, bf_write buffer) { msg.WriteToBuffer(buffer); } - static ReadOnlySpan GetObjectClassName(int objectId) { - throw new NotImplementedException(); + public static ReadOnlySpan GetObjectClassName(int objectId) { + if (objectId >= 0 && objectId < sv.NumEdicts) + return sv.Edicts![objectId].GetClassName(); + else + return "[unknown]"; } }