warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(codegen): Fixes codegenning timers when they are null. (#723)

Browse source 
When a timer is null, the code generator will use `TimeSpan.MinValue` as the delay.
This commit is contained in:
Kamron Batman 2021-08-23 20:44:02 -07:00 • committed by GitHub
parent dd62e17693
commit 671cc769a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/SerializationGenerator/SerializableMigration/Rules/TimerMigrationRule.cs
View file

@ -63,7 +63,8 @@ namespace SerializableMigration
var driftTimer = ruleArguments![0].Contains("@TimerDrift"); var driftTimer = ruleArguments![0].Contains("@TimerDrift");
var readTimer = driftTimer ? "reader.ReadDeltaTime()" : "reader.ReadDateTime()"; var readTimer = driftTimer ? "reader.ReadDeltaTime()" : "reader.ReadDateTime()";
source.AppendLine($"{indent}var {propertyName}Delay = {readTimer} - Core.Now;"); source.AppendLine($"{indent}var {propertyName}Next = {readTimer};");
source.AppendLine($"{indent}var {propertyName}Delay = {propertyName}Next == System.DateTime.MinValue ? System.TimeSpan.MinValue : {propertyName}Next - Core.Now;");
} }
public void GenerateSerializationMethod(StringBuilder source, string indent, SerializableProperty property) public void GenerateSerializationMethod(StringBuilder source, string indent, SerializableProperty property)
@ -80,7 +81,7 @@ namespace SerializableMigration
var driftTimer = ruleArguments![0].Contains("@TimerDrift"); var driftTimer = ruleArguments![0].Contains("@TimerDrift");
var writerMethod = driftTimer ? "WriteDeltaTime" : "Write"; var writerMethod = driftTimer ? "WriteDeltaTime" : "Write";
source.AppendLine($"{indent}writer.{writerMethod}({propertyName}.Next);"); source.AppendLine($"{indent}writer.{writerMethod}({propertyName}?.Next ?? System.DateTime.MinValue);");
} }
public void PostDeserializeMethod( public void PostDeserializeMethod(

2
Projects/Server/NativeReader.cs
View file

@ -57,6 +57,6 @@ namespace Server
InternalRead(source, buffer, bufferIndex, length); InternalRead(source, buffer, bufferIndex, length);
internal unsafe int InternalRead(FileStream source, void* buffer, int bufferIndex, int length) => internal unsafe int InternalRead(FileStream source, void* buffer, int bufferIndex, int length) =>
UnsafeNativeMethods.read(source.SafeFileHandle.DangerousGetHandle(), (byte*)buffer + bufferIndex, length); UnsafeNativeMethods.read(source.SafeFileHandle!.DangerousGetHandle(), (byte*)buffer + bufferIndex, length);
} }
} }