IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 13:15:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Massively improve CPU Usage.

Browse source
This commit is contained in:
SilicaAndPina 2022-04-15 00:07:41 +12:00
parent 298c2aca4a
commit 80b0e88e1e
3 changed files with 55 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
HorseIsleServer/HISPCli/Program.cs
View file

@ -1,6 +1,7 @@
using HISP.Server;
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace HISP.Cli
@ -10,6 +11,7 @@ namespace HISP.Cli
private static StreamWriter sw = null;
private static FileStream fs = null;
private static string logFile;
private static EventWaitHandle shutdownHandle;
public static bool ShuttingDown = false;
public static string BaseDir;
@ -42,7 +44,7 @@ namespace HISP.Cli
public static void OnShutdown()
{
ShuttingDown = true;
shutdownHandle.Set();
}
public static void LogToFile(bool error, string type,string text)
{
@ -125,9 +127,9 @@ namespace HISP.Cli
Entry.SetShutdownCallback(OnShutdown);
Entry.Start();
while (!ShuttingDown) { /* Allow asyncronous operations to happen. */ };
Task.WaitAll();
shutdownHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
shutdownHandle.WaitOne();
}
}
}

15
HorseIsleServer/LibHISP/Game/World.cs
View file

@ -158,14 +158,7 @@ namespace HISP.Game
public class Time
{
public double PreciseMinutes;
public int Minutes
{
get
{
return Convert.ToInt32(Math.Floor(PreciseMinutes));
}
}
public int Minutes;
public int Days;
public int Years;
}
@ -198,13 +191,13 @@ namespace HISP.Game
public static void TickWorldClock()
{
ServerTime.PreciseMinutes += 0.1;
ServerTime.Minutes++;
if (ServerTime.Minutes > 1440) // 1 day
{
ServerTime.Days += 1;
ServerTime.PreciseMinutes = 0.0;
ServerTime.Minutes = 0;
Database.DoIntrestPayments(ConfigReader.IntrestRate);
}
@ -219,7 +212,7 @@ namespace HISP.Game
public static void ReadWorldData()
{
Logger.DebugPrint("Reading time from database...");
ServerTime.PreciseMinutes = Database.GetServerTime();
ServerTime.Minutes = Database.GetServerTime();
ServerTime.Days = Database.GetServerDay();
ServerTime.Years = Database.GetServerYear();
StartDate = Database.GetServerStartTime();

94
HorseIsleServer/LibHISP/Server/GameServer.cs
View file

@ -42,73 +42,69 @@ namespace HISP.Server
/*
* Private stuff
*/
private static int gameTickSpeed = 480; // Changing this to ANYTHING else will cause desync with the client.
private static int gameTickSpeed = 4800; // Changing this to ANYTHING else will cause desync with the client.
private static int totalMinutesElapsed = 0;
private static int oneMinute = 1000 * 60;
private static Timer gameTimer; // Controls in-game time.
private static Timer minuteTimer; // ticks every real world minute.
private static int lastServerTime = 0;
private static void onGameTick(object state)
{
// Tick the game clock.
World.TickWorldClock();
if(World.ServerTime.Minutes != lastServerTime)
// Start all events with this RaceEvery set.
Arena.StartArenas(World.ServerTime.Minutes);
// Decrement horse train timer
Database.DecHorseTrainTimeout();
// Write time to database:
Database.SetServerTime(World.ServerTime.Minutes, World.ServerTime.Days, World.ServerTime.Years);
// Ranch Windmill Payments
if (World.ServerTime.Minutes % 720 == 0) // every 12 hours
{
lastServerTime = World.ServerTime.Minutes;
// Start all events with this RaceEvery set.
Arena.StartArenas(World.ServerTime.Minutes);
// Decrement horse train timer
Database.DecHorseTrainTimeout();
// Write time to database:
Database.SetServerTime(World.ServerTime.Minutes, World.ServerTime.Days, World.ServerTime.Years);
// Ranch Windmill Payments
if (World.ServerTime.Minutes % 720 == 0) // every 12 hours
Logger.DebugPrint("Paying windmill owners . . . ");
foreach (Ranch ranch in Ranch.Ranches)
{
Logger.DebugPrint("Paying windmill owners . . . ");
foreach (Ranch ranch in Ranch.Ranches)
int ranchOwner = ranch.OwnerId;
if (ranchOwner != -1)
{
int ranchOwner = ranch.OwnerId;
if (ranchOwner != -1)
int moneyToAdd = 5000 * ranch.GetBuildingCount(8); // Windmill
if (GameServer.IsUserOnline(ranchOwner))
GameServer.GetUserById(ranchOwner).AddMoney(moneyToAdd);
else
{
int moneyToAdd = 5000 * ranch.GetBuildingCount(8); // Windmill
if (GameServer.IsUserOnline(ranchOwner))
GameServer.GetUserById(ranchOwner).AddMoney(moneyToAdd);
else
try
{
try
{
Database.SetPlayerMoney(Database.GetPlayerMoney(ranchOwner) + moneyToAdd, ranchOwner);
}
catch (OverflowException)
{
Database.SetPlayerMoney(2147483647, ranchOwner);
}
Database.SetPlayerMoney(Database.GetPlayerMoney(ranchOwner) + moneyToAdd, ranchOwner);
}
catch (OverflowException)
{
Database.SetPlayerMoney(2147483647, ranchOwner);
}
}
}
}
if((World.StartDate != -1)) // Birthday tokens
{
int curTime = (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
if (curTime >= World.StartDate + 378691200)
{
Logger.InfoPrint("Your server has been running for 12 years! Adding birthday tokens");
Database.SetStartTime(-1);
World.StartDate = -1;
AddItemToAllUsersEvenOffline(Item.BirthdayToken, 10);
}
}
gameTimer.Change(gameTickSpeed, gameTickSpeed);
}
if((World.StartDate != -1)) // Birthday tokens
{
int curTime = (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
if (curTime >= World.StartDate + 378691200)
{
Logger.InfoPrint("Your server has been running for 12 years! Adding birthday tokens");
Database.SetStartTime(-1);
World.StartDate = -1;
AddItemToAllUsersEvenOffline(Item.BirthdayToken, 10);
}
}
gameTimer.Change(gameTickSpeed, gameTickSpeed);
}
private static void onMinuteTick(object state)
{