aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Database/Models/DatabaseContext.cs
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");
} }

5
ReallifeGamemode.Server/Gangwar/Gangwar.cs
View File

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

4
ReallifeGamemode.Server/Managers/TimeManager.cs
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);
} });
}
} }
} }

40
ReallifeGamemode.Server/Managers/VehicleManager.cs
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
{ {
@@ -751,7 +755,9 @@ namespace ReallifeGamemode.Server.Managers
public static void VehicleTimerTick() public static void VehicleTimerTick()
{ {
NAPI.Pools.GetAllVehicles().ForEach(v => NAPI.Task.Run(() =>
{
NAPI.Pools.GetAllVehicles().ForEach(v =>
{ {
if (v.Handle.Value == 0 || v.Handle == default) if (v.Handle.Value == 0 || v.Handle == default)
{ {
@@ -782,29 +788,31 @@ 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;
// save to db
using (var dbContext = new DatabaseContext())
{ {
foreach (var key in lastPositions.Keys.ToList()) lastSave = DateTime.UtcNow;
// save to db
using (var dbContext = new DatabaseContext())
{ {
Vehicle v = key.Entity<Vehicle>(); foreach (var key in lastPositions.Keys.ToList())
if (v == null) continue; {
if (!v.HasSharedData("drivenDistance")) continue; Vehicle v = key.Entity<Vehicle>();
if (v == null) continue;
if (!v.HasSharedData("drivenDistance")) continue;
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext);
if (sVeh == null) continue; if (sVeh == null) continue;
sVeh.DistanceDriven = (float)v.GetSharedData<dynamic>("drivenDistance"); sVeh.DistanceDriven = (float)v.GetSharedData<dynamic>("drivenDistance");
}
dbContext.SaveChanges();
} }
dbContext.SaveChanges();
} }
} });
} }
public static void AddVehicle(ServerVehicle serverVehicle, Vehicle vehicle) public static void AddVehicle(ServerVehicle serverVehicle, Vehicle vehicle)
{ {
if (_serverVehicles.ContainsKey(serverVehicle.Id)) if (_serverVehicles.ContainsKey(serverVehicle.Id))

31
ReallifeGamemode.Server/Util/ThreadTimers.cs
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;
@@ -31,27 +32,39 @@ namespace ReallifeGamemode.Server.Util
private static void Timer500_Elapsed(object sender, ElapsedEventArgs e) private static void Timer500_Elapsed(object sender, ElapsedEventArgs e)
{ {
TaxiDriverJob.UpdateFare(); NAPI.Task.Run(() =>
VehicleManager.VehicleTimerTick(); {
TaxiDriverJob.UpdateFare();
VehicleManager.VehicleTimerTick();
});
} }
private static void Timer60000_Elapsed(object sender, ElapsedEventArgs e) private static void Timer60000_Elapsed(object sender, ElapsedEventArgs e)
{ {
Jail.JailOut_Elapsed(); NAPI.Task.Run(() =>
Economy.Timer_Elapsed(); {
WeaponDealManager.Timer_Elapsed(); Jail.JailOut_Elapsed();
Economy.Timer_Elapsed();
WeaponDealManager.Timer_Elapsed();
});
} }
private static void Timer10000_Elapsed(object sender, ElapsedEventArgs e) private static void Timer10000_Elapsed(object sender, ElapsedEventArgs e)
{ {
Jail.BrakeOut_Elapsed(); NAPI.Task.Run(() =>
{
Jail.BrakeOut_Elapsed();
});
} }
private static void Timer2500_Elapsed(object sender, ElapsedEventArgs e) private static void Timer2500_Elapsed(object sender, ElapsedEventArgs e)
{ {
WantedEscapeTimer.Timer_Elapsed(); NAPI.Task.Run(() =>
Jail.JailIn_Elapsed(); {
Gangwar.Gangwar.Value_TimerElapsed(); WantedEscapeTimer.Timer_Elapsed();
Jail.JailIn_Elapsed();
Gangwar.Gangwar.Value_TimerElapsed();
});
} }
} }
} }