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

Adjust Gangwar Takeover

Browse Source
This commit is contained in:
VegaZ
2021-04-07 20:35:54 +02:00
parent 3f502f8bf6
commit 411e509495
3 changed files with 1217 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1172
ReallifeGamemode.Client/Gui/Inventory/inventory.ts
View File

File diff suppressed because it is too large Load Diff

1144
ReallifeGamemode.Client/Gui/Inventory/inventory_old.ts Normal file
View File

File diff suppressed because it is too large Load Diff

11
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -114,16 +114,13 @@ namespace ReallifeGamemode.Server.Gangwar
this.timerCount = 0; this.timerCount = 0;
} }
private void reloadGangTurfs() private void ReloadGangTurfs()
{ {
var t = Task.Factory.StartNew(() => NAPI.Task.Run(() =>
{ {
Task.Delay(10000).Wait();
Gangwar.loadTurfs(); Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllPlayers(); Gangwar.loadTurfs_ToAllPlayers();
}); }, delayTime: 2000);
t.Wait();
} }
private void Tick(object sender, System.Timers.ElapsedEventArgs e) private void Tick(object sender, System.Timers.ElapsedEventArgs e)
@@ -303,7 +300,7 @@ namespace ReallifeGamemode.Server.Gangwar
NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:Turf_Conquered", JsonConvert.SerializeObject(this.TurfID), JsonConvert.SerializeObject(this.status), JsonConvert.SerializeObject(this.Owner)); NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:Turf_Conquered", JsonConvert.SerializeObject(this.TurfID), JsonConvert.SerializeObject(this.status), JsonConvert.SerializeObject(this.Owner));
Gangwar.loadTurfs(); Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllPlayers(); Gangwar.loadTurfs_ToAllPlayers();
reloadGangTurfs(); ReloadGangTurfs();
} }
public void attack(string attacker) public void attack(string attacker)