AstralTransRocketries/TrueCraft
Archived
1
0
Fork 0
Code Issues 48 Pull Requests 1 Packages Projects Releases Wiki Activity

Switch to DateTime.UtcNow for everything

Browse Source
This commit is contained in:
Drew DeVault 2015-07-02 12:14:55 -06:00
parent bda2e11885
commit 8b1930eeac
17 changed files with 41 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TrueCraft.Client/Interface/ChatInterface.cs
View File

@ -96,7 +96,7 @@ namespace TrueCraft.Client.Interface
public ChatMessage(string message)
{
Message = message;
Time = DateTime.Now;
Time = DateTime.UtcNow;
}
}
@ -135,7 +135,7 @@ namespace TrueCraft.Client.Interface
for (int i = 0; i < Messages.Count; i++)
{
var message = Messages[i];
if ((DateTime.Now - message.Time).TotalSeconds > 10)
if ((DateTime.UtcNow - message.Time).TotalSeconds > 10)
{
Messages.RemoveAt(i);
i--;

4
TrueCraft.Client/PhysicsEngine.cs
View File

@ -49,7 +49,7 @@ namespace TrueCraft.Client
private BoundingBox TempBoundingBox;
public void Update()
{
double multipler = (DateTime.Now - LastUpdate).TotalMilliseconds / MillisecondsBetweenUpdates;
double multipler = (DateTime.UtcNow - LastUpdate).TotalMilliseconds / MillisecondsBetweenUpdates;
if (LastUpdate == DateTime.MinValue)
multipler = 1;
if (multipler > 5) multipler = 5;
@ -69,7 +69,7 @@ namespace TrueCraft.Client
}
}
}
LastUpdate = DateTime.Now;
LastUpdate = DateTime.UtcNow;
}
private void CheckWithTerrain(IAABBEntity entity, ReadOnlyWorld world)

4
TrueCraft.Client/TrueCraftGame.cs
View File

@ -343,7 +343,7 @@ namespace TrueCraft.Client
if (PendingMainThreadActions.TryTake(out action))
action();
if (NextPhysicsUpdate < DateTime.Now && Client.LoggedIn)
if (NextPhysicsUpdate < DateTime.UtcNow && Client.LoggedIn)
{
IChunk chunk;
var adjusted = Client.World.World.FindBlockPosition(new Coordinates3D((int)Client.Position.X, 0, (int)Client.Position.Z), out chunk);
@ -358,7 +358,7 @@ namespace TrueCraft.Client
Client.QueuePacket(new PlayerGroundedPacket { OnGround = true });
Client.QueuePacket(new PlayerPositionAndLookPacket(Client.Position.X, Client.Position.Y,
Client.Position.Y + MultiplayerClient.Height, Client.Position.Z, Client.Yaw, Client.Pitch, false));
NextPhysicsUpdate = DateTime.Now.AddMilliseconds(1000 / 20);
NextPhysicsUpdate = DateTime.UtcNow.AddMilliseconds(1000 / 20);
}
if (Delta != Microsoft.Xna.Framework.Vector3.Zero)

2
TrueCraft.Core/Entities/Entity.cs
View File

@ -17,7 +17,7 @@ namespace TrueCraft.Core.Entities
{
EnablePropertyChange = true;
EntityID = -1;
SpawnTime = DateTime.Now;
SpawnTime = DateTime.UtcNow;
}
public DateTime SpawnTime { get; set; }

20
TrueCraft.Core/Entities/ItemEntity.cs
View File

@ -99,7 +99,7 @@ namespace TrueCraft.Core.Entities
public override void Update(IEntityManager entityManager)
{
var nearbyEntities = entityManager.EntitiesInRange(Position, PickupRange);
if ((DateTime.Now - SpawnTime).TotalSeconds > 1)
if ((DateTime.UtcNow - SpawnTime).TotalSeconds > 1)
{
var player = nearbyEntities.FirstOrDefault(e => e is PlayerEntity && (e as PlayerEntity).Health != 0
&& e.Position.DistanceTo(Position) <= PickupRange);
@ -109,24 +109,8 @@ namespace TrueCraft.Core.Entities
playerEntity.OnPickUpItem(this);
entityManager.DespawnEntity(this);
}
/* TODO: Merging item entities (this code behaves strangely
var item = nearbyEntities.FirstOrDefault(e => e is ItemEntity
&& e != this
&& (DateTime.Now - (e as ItemEntity).SpawnTime).TotalSeconds > 1
&& (e as ItemEntity).Item.ID == Item.ID && (e as ItemEntity).Item.Metadata == Item.Metadata
&& (e as ItemEntity).Item.Nbt == Item.Nbt
&& e.Position.DistanceTo(Position) < PickupRange);
if (item != null)
{
// Merge
entityManager.DespawnEntity(item);
var newItem = Item;
newItem.Count += (item as ItemEntity).Item.Count;
Item = newItem;
OnPropertyChanged("Metadata");
}*/
}
if ((DateTime.Now - SpawnTime).TotalMinutes > 5)
if ((DateTime.UtcNow - SpawnTime).TotalMinutes > 5)
entityManager.DespawnEntity(this);
base.Update(entityManager);
}

2
TrueCraft.Core/Logging/LogHelpers.cs
View File

@ -8,7 +8,7 @@ namespace TrueCraft.Core.Logging
{
public static class LogHelpers
{
public static string GetTimestamp(bool utc = false, string timeFormat = "yyyy-MM-dd H:mm:ss", string suffix = " ")
public static string GetTimestamp(bool utc = true, string timeFormat = "yyyy-MM-dd H:mm:ss", string suffix = " ")
{
return (utc ? DateTime.UtcNow : DateTime.Now).ToString(timeFormat) + suffix;
}

4
TrueCraft.Core/Logic/Blocks/CropsBlock.cs
View File

@ -50,7 +50,7 @@ namespace TrueCraft.Core.Logic.Blocks
{
var chunk = world.FindChunk(coords);
server.Scheduler.ScheduleEvent(
chunk, DateTime.Now.AddSeconds(MathHelper.Random.Next(30, 60)),
chunk, DateTime.UtcNow.AddSeconds(MathHelper.Random.Next(30, 60)),
(_server) => GrowBlock(_server, world, coords));
}
}
@ -67,7 +67,7 @@ namespace TrueCraft.Core.Logic.Blocks
public override void BlockPlaced(BlockDescriptor descriptor, BlockFace face, IWorld world, IRemoteClient user)
{
var chunk = world.FindChunk(descriptor.Coordinates);
user.Server.Scheduler.ScheduleEvent(chunk, DateTime.Now.AddSeconds(MathHelper.Random.Next(30, 60)),
user.Server.Scheduler.ScheduleEvent(chunk, DateTime.UtcNow.AddSeconds(MathHelper.Random.Next(30, 60)),
(server) => GrowBlock(server, world, descriptor.Coordinates + MathHelper.BlockFaceToCoordinates(face)));
}
}

4
TrueCraft.Core/Logic/Blocks/FarmlandBlock.cs
View File

@ -87,7 +87,7 @@ namespace TrueCraft.Core.Logic.Blocks
}
var chunk = world.FindChunk(coords);
server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(UpdateIntervalSeconds),
DateTime.UtcNow.AddSeconds(UpdateIntervalSeconds),
_server => HydrationCheckEvent(_server, coords, world));
}
@ -99,7 +99,7 @@ namespace TrueCraft.Core.Logic.Blocks
}
var chunk = world.FindChunk(descriptor.Coordinates);
user.Server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(UpdateIntervalSeconds),
DateTime.UtcNow.AddSeconds(UpdateIntervalSeconds),
server => HydrationCheckEvent(server, descriptor.Coordinates, world));
}
}

6
TrueCraft.Core/Logic/Blocks/FluidBlock.cs
View File

@ -71,7 +71,7 @@ namespace TrueCraft.Core.Logic.Blocks
{
var chunk = world.FindChunk(coords);
server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(SecondsBetweenUpdates), (_server) =>
DateTime.UtcNow.AddSeconds(SecondsBetweenUpdates), (_server) =>
AutomataUpdate(_server, world, coords));
}
@ -106,7 +106,7 @@ namespace TrueCraft.Core.Logic.Blocks
{
var chunk = world.FindChunk(coords);
server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(SecondsBetweenUpdates), (_server) =>
DateTime.UtcNow.AddSeconds(SecondsBetweenUpdates), (_server) =>
AutomataUpdate(_server, world, coords));
}
}
@ -161,7 +161,7 @@ namespace TrueCraft.Core.Logic.Blocks
world.SetMetadata(target.TargetBlock, target.Level);
var chunk = world.FindChunk(target.TargetBlock);
server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(SecondsBetweenUpdates),
DateTime.UtcNow.AddSeconds(SecondsBetweenUpdates),
s => AutomataUpdate(s, world, target.TargetBlock));
}

6
TrueCraft.Core/Logic/Blocks/SugarcaneBlock.cs
View File

@ -105,13 +105,13 @@ namespace TrueCraft.Core.Logic.Blocks
{
world.SetBlockID(coords + Coordinates3D.Up, BlockID);
server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(MathHelper.Random.Next(MinGrowthSeconds, MaxGrowthSeconds)),
DateTime.UtcNow.AddSeconds(MathHelper.Random.Next(MinGrowthSeconds, MaxGrowthSeconds)),
(_server) => TryGrowth(_server, coords + Coordinates3D.Up, world));
}
else
{
server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(MathHelper.Random.Next(MinGrowthSeconds, MaxGrowthSeconds)),
DateTime.UtcNow.AddSeconds(MathHelper.Random.Next(MinGrowthSeconds, MaxGrowthSeconds)),
(_server) => TryGrowth(_server, coords, world));
}
}
@ -121,7 +121,7 @@ namespace TrueCraft.Core.Logic.Blocks
{
var chunk = world.FindChunk(descriptor.Coordinates);
user.Server.Scheduler.ScheduleEvent(chunk,
DateTime.Now.AddSeconds(MathHelper.Random.Next(MinGrowthSeconds, MaxGrowthSeconds)),
DateTime.UtcNow.AddSeconds(MathHelper.Random.Next(MinGrowthSeconds, MaxGrowthSeconds)),
(server) => TryGrowth(server, descriptor.Coordinates, world));
}
}

6
TrueCraft.Core/World/World.cs
View File

@ -42,11 +42,11 @@ namespace TrueCraft.Core.World
{
get
{
return (long)((DateTime.Now - BaseTime).TotalSeconds * 20) % 24000;
return (long)((DateTime.UtcNow - BaseTime).TotalSeconds * 20) % 24000;
}
set
{
BaseTime = DateTime.Now.AddSeconds(-value / 20);
BaseTime = DateTime.UtcNow.AddSeconds(-value / 20);
}
}
@ -57,7 +57,7 @@ namespace TrueCraft.Core.World
public World()
{
Regions = new Dictionary<Coordinates2D, IRegion>();
BaseTime = DateTime.Now;
BaseTime = DateTime.UtcNow;
}
public World(string name) : this()

2
TrueCraft/EntityManager.cs
View File

@ -228,7 +228,7 @@ namespace TrueCraft
{
if (entity.Despawned)
return;
entity.SpawnTime = DateTime.Now;
entity.SpawnTime = DateTime.UtcNow;
entity.EntityManager = this;
entity.World = World;
entity.EntityID = NextEntityID++;

10
TrueCraft/EventScheduler.cs
View File

@ -30,7 +30,13 @@ namespace TrueCraft
Subjects.Add(subject);
subject.Disposed += Subject_Disposed;
}
Events.Add(new ScheduledEvent { Subject = subject, When = when, Action = action });
int i;
for (i = 0; i < Events.Count; i++)
{
if (Events[i].When > when)
break;
}
Events.Insert(i, new ScheduledEvent { Subject = subject, When = when, Action = action });
}
}
@ -55,7 +61,7 @@ namespace TrueCraft
{
lock (EventLock)
{
var start = DateTime.Now;
var start = DateTime.UtcNow;
for (int i = 0; i < Events.Count; i++)
{
var e = Events[i];

4
TrueCraft/Handlers/InteractionHandlers.cs
View File

@ -137,7 +137,7 @@ namespace TrueCraft.Handlers
{
server.SendMessage(ChatColor.Red + "WARNING: block provider for ID {0} is null (player placing)", block.Value.ID);
server.SendMessage(ChatColor.Red + "Error occured from client {0} at coordinates {1}", client.Username, block.Value.Coordinates);
server.SendMessage(ChatColor.Red + "Packet logged at {0}, please report upstream", DateTime.Now);
server.SendMessage(ChatColor.Red + "Packet logged at {0}, please report upstream", DateTime.UtcNow);
return;
}
if (!provider.BlockRightClicked(block.Value, packet.Face, client.World, client))
@ -159,7 +159,7 @@ namespace TrueCraft.Handlers
{
server.SendMessage(ChatColor.Red + "WARNING: item provider for ID {0} is null (player placing)", block.Value.ID);
server.SendMessage(ChatColor.Red + "Error occured from client {0} at coordinates {1}", client.Username, block.Value.Coordinates);
server.SendMessage(ChatColor.Red + "Packet logged at {0}, please report upstream", DateTime.Now);
server.SendMessage(ChatColor.Red + "Packet logged at {0}, please report upstream", DateTime.UtcNow);
}
if (block != null)
{

4
TrueCraft/Handlers/LoginHandlers.cs
View File

@ -70,8 +70,8 @@ namespace TrueCraft.Handlers
var entityManager = server.GetEntityManagerForWorld(remoteClient.World);
entityManager.SpawnEntity(remoteClient.Entity);
entityManager.SendEntitiesToClient(remoteClient);
server.Scheduler.ScheduleEvent(remoteClient, DateTime.Now.AddSeconds(10), remoteClient.SendKeepAlive);
server.Scheduler.ScheduleEvent(remoteClient, DateTime.Now.AddSeconds(1), remoteClient.ExpandChunkRadius);
server.Scheduler.ScheduleEvent(remoteClient, DateTime.UtcNow.AddSeconds(10), remoteClient.SendKeepAlive);
server.Scheduler.ScheduleEvent(remoteClient, DateTime.UtcNow.AddSeconds(1), remoteClient.ExpandChunkRadius);
if (!string.IsNullOrEmpty(Program.ServerConfiguration.MOTD))
remoteClient.SendMessage(Program.ServerConfiguration.MOTD);

4
TrueCraft/PhysicsEngine.cs
View File

@ -47,7 +47,7 @@ namespace TrueCraft
private BoundingBox TempBoundingBox;
public void Update()
{
double multipler = (DateTime.Now - LastUpdate).TotalMilliseconds / MillisecondsBetweenUpdates;
double multipler = (DateTime.UtcNow - LastUpdate).TotalMilliseconds / MillisecondsBetweenUpdates;
if (LastUpdate == DateTime.MinValue)
multipler = 1;
if (multipler > 5) multipler = 5;
@ -67,7 +67,7 @@ namespace TrueCraft
}
}
}
LastUpdate = DateTime.Now;
LastUpdate = DateTime.UtcNow;
}
private void CheckWithTerrain(IAABBEntity entity, IWorld world)

6
TrueCraft/RemoteClient.cs
View File

@ -226,7 +226,7 @@ namespace TrueCraft
public void Log(string message, params object[] parameters)
{
if (EnableLogging)
SendMessage(ChatColor.Gray + string.Format("[" + DateTime.Now.ToShortTimeString() + "] " + message, parameters));
SendMessage(ChatColor.Gray + string.Format("[" + DateTime.UtcNow.ToShortTimeString() + "] " + message, parameters));
}
public void QueuePacket(IPacket packet)
@ -389,7 +389,7 @@ namespace TrueCraft
{
ChunkRadius++;
UpdateChunks();
server.Scheduler.ScheduleEvent(this, DateTime.Now.AddSeconds(1), ExpandChunkRadius);
server.Scheduler.ScheduleEvent(this, DateTime.UtcNow.AddSeconds(1), ExpandChunkRadius);
}
});
}
@ -397,7 +397,7 @@ namespace TrueCraft
internal void SendKeepAlive(IMultiplayerServer server)
{
QueuePacket(new KeepAlivePacket());
server.Scheduler.ScheduleEvent(this, DateTime.Now.AddSeconds(1), SendKeepAlive);
server.Scheduler.ScheduleEvent(this, DateTime.UtcNow.AddSeconds(1), SendKeepAlive);
}
internal void UpdateChunks()