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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
kookroach
2021-04-05 01:19:51 +02:00
parent ed0b1a8f39 3f134acd09
commit 2f46826c35
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/core/rage-mp/game.ts
View File

@@ -10,8 +10,8 @@ export default class RageGame implements IGame {
events: IEvents = new RageEvents; events: IEvents = new RageEvents;
ui: IUi = new RageUi; ui: IUi = new RageUi;
wait(ms: number): void { async wait(ms: number): Promise<void> {
mp.game.waitAsync(ms); await mp.game.waitAsync(ms);
} }
disableDefaultEngineBehaviour(): void { disableDefaultEngineBehaviour(): void {

2
ReallifeGamemode.Client/game.ts
View File

@@ -1,5 +1,5 @@
interface IGame { interface IGame {
wait(ms: number); wait(ms: number): Promise<void>;
events: IEvents; events: IEvents;
ui: IUi; ui: IUi;

8
ReallifeGamemode.Client/vehiclesync/vehiclesync.ts
View File

@@ -10,9 +10,9 @@ game.events.add('SERVER:Vehicle:UpdateData', (vehId, dataStr) => {
setVehicleData(vehicle, data); setVehicleData(vehicle, data);
}); });
game.events.onPlayerEnterVehicle((vehicle, seat) => { game.events.onPlayerEnterVehicle(async (vehicle, seat) => {
while (!game.players.local.inVehicle) { while (!game.players.local.inVehicle) {
game.wait(0); await game.wait(0);
} }
if (vehicle) { if (vehicle) {
@@ -22,11 +22,11 @@ game.events.onPlayerEnterVehicle((vehicle, seat) => {
} }
}); });
game.events.onPlayerExitVehicle(() => { game.events.onPlayerExitVehicle(async () => {
var veh = game.players.local.vehicle; var veh = game.players.local.vehicle;
while (game.players.local.inVehicle) { while (game.players.local.inVehicle) {
game.wait(0); await game.wait(0);
} }
if (veh) { if (veh) {

10
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -560,7 +560,8 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3) }
else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
{ {
if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0) if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
{ {
@@ -578,11 +579,6 @@ namespace ReallifeGamemode.Server.Events
return; return;
} }
} }
else
{
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return;
}
if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
{ {
if (job.GetUsersInJob().Contains(player)) if (job.GetUsersInJob().Contains(player))
@@ -598,7 +594,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }
else else
{ {
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");

2
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -19,7 +19,7 @@ namespace ReallifeGamemode.Server.Job
public override bool NeedVehicleToStart => false; public override bool NeedVehicleToStart => false;
const int MAX_BAG = 50; const int MAX_BAG = 40;
public RefuseCollectorJob() public RefuseCollectorJob()
{ {