some fixes

This commit is contained in:
michael.reiswich
2021-01-17 17:19:31 +01:00
parent 9f82d06e5d
commit 1e1b5ec7e1
5 changed files with 54 additions and 28 deletions

View File

@@ -29,7 +29,7 @@ namespace ReallifeGamemode.Database.Models
{ {
optionsBuilder.UseLoggerFactory(LoggerFactory); optionsBuilder.UseLoggerFactory(LoggerFactory);
} }
optionsBuilder.EnableSensitiveDataLogging();
optionsBuilder.UseMySql("Host=localhost;Port=3306;Database=gtav-devdb;Username=gtav-dev;Password=Test123"); optionsBuilder.UseMySql("Host=localhost;Port=3306;Database=gtav-devdb;Username=gtav-dev;Password=Test123");
} }

View File

@@ -220,7 +220,10 @@ namespace ReallifeGamemode.Server.Gangwar
} }
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
NAPI.Task.Run(() =>
{
NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:UpdateTurfValue", JsonConvert.SerializeObject(values.ToArray())); NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:UpdateTurfValue", JsonConvert.SerializeObject(values.ToArray()));
});
} }
} }
} }

View File

@@ -31,7 +31,9 @@ namespace ReallifeGamemode.Server.Managers
{ {
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
CurrentTime = now.TimeOfDay; CurrentTime = now.TimeOfDay;
NAPI.Task.Run(() => {
NAPI.World.SetTime(now.Hour, now.Minute, now.Second); NAPI.World.SetTime(now.Hour, now.Minute, now.Second);
});
} }
} }
} }

View File

@@ -9,6 +9,10 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Timers; using System.Timers;
using System.Threading.Tasks;
namespace ReallifeGamemode.Server.Managers namespace ReallifeGamemode.Server.Managers
{ {
@@ -750,6 +754,8 @@ namespace ReallifeGamemode.Server.Managers
} }
public static void VehicleTimerTick() public static void VehicleTimerTick()
{
NAPI.Task.Run(() =>
{ {
NAPI.Pools.GetAllVehicles().ForEach(v => NAPI.Pools.GetAllVehicles().ForEach(v =>
{ {
@@ -782,6 +788,7 @@ namespace ReallifeGamemode.Server.Managers
v.SetSharedData("drivenDistance", (float)distanceDriven); v.SetSharedData("drivenDistance", (float)distanceDriven);
}); });
if (DateTime.UtcNow.Subtract(lastSave).Seconds >= 30) if (DateTime.UtcNow.Subtract(lastSave).Seconds >= 30)
{ {
lastSave = DateTime.UtcNow; lastSave = DateTime.UtcNow;
@@ -803,6 +810,7 @@ namespace ReallifeGamemode.Server.Managers
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
});
} }
public static void AddVehicle(ServerVehicle serverVehicle, Vehicle vehicle) public static void AddVehicle(ServerVehicle serverVehicle, Vehicle vehicle)

View File

@@ -1,4 +1,5 @@
using System.Timers; using System.Timers;
using GTANetworkAPI;
using ReallifeGamemode.Server.Finance; using ReallifeGamemode.Server.Finance;
using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Managers;
@@ -30,28 +31,40 @@ namespace ReallifeGamemode.Server.Util
} }
private static void Timer500_Elapsed(object sender, ElapsedEventArgs e) private static void Timer500_Elapsed(object sender, ElapsedEventArgs e)
{
NAPI.Task.Run(() =>
{ {
TaxiDriverJob.UpdateFare(); TaxiDriverJob.UpdateFare();
VehicleManager.VehicleTimerTick(); VehicleManager.VehicleTimerTick();
});
} }
private static void Timer60000_Elapsed(object sender, ElapsedEventArgs e) private static void Timer60000_Elapsed(object sender, ElapsedEventArgs e)
{
NAPI.Task.Run(() =>
{ {
Jail.JailOut_Elapsed(); Jail.JailOut_Elapsed();
Economy.Timer_Elapsed(); Economy.Timer_Elapsed();
WeaponDealManager.Timer_Elapsed(); WeaponDealManager.Timer_Elapsed();
});
} }
private static void Timer10000_Elapsed(object sender, ElapsedEventArgs e) private static void Timer10000_Elapsed(object sender, ElapsedEventArgs e)
{
NAPI.Task.Run(() =>
{ {
Jail.BrakeOut_Elapsed(); Jail.BrakeOut_Elapsed();
});
} }
private static void Timer2500_Elapsed(object sender, ElapsedEventArgs e) private static void Timer2500_Elapsed(object sender, ElapsedEventArgs e)
{
NAPI.Task.Run(() =>
{ {
WantedEscapeTimer.Timer_Elapsed(); WantedEscapeTimer.Timer_Elapsed();
Jail.JailIn_Elapsed(); Jail.JailIn_Elapsed();
Gangwar.Gangwar.Value_TimerElapsed(); Gangwar.Gangwar.Value_TimerElapsed();
});
} }
} }
} }