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

aaaaaaaaa

Browse Source
This commit is contained in:
hydrant
2020-07-29 21:54:25 +02:00
parent d4770c88ed
commit d88b4d8ebf
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReallifeGamemode.Client/core/rage-mp/entities.ts
View File

@@ -1,5 +1,6 @@
import { IEntity, IPlayer, IEntityAttachments, IEntityAttachmentPool, IPlayerPool, IVehicle, IVehiclePool, VehicleSeat, EntityType } from "../../game"; import { IEntity, IPlayer, IEntityAttachments, IEntityAttachmentPool, IPlayerPool, IVehicle, IVehiclePool, VehicleSeat, EntityType } from "../../game";
import { parseJson } from "../../util"; import { parseJson } from "../../util";
import game from "../..";
class RageEntity implements IEntity { class RageEntity implements IEntity {
private entity: EntityMp; private entity: EntityMp;
@@ -184,11 +185,22 @@ class RageVehicle extends RageEntity implements IVehicle {
class RageVehiclePool implements IVehiclePool { class RageVehiclePool implements IVehiclePool {
at(id: number): IVehicle { at(id: number): IVehicle {
return new RageVehicle(mp.vehicles.atRemoteId(Number(id))); var veh = mp.vehicles.atRemoteId(Number(id));
if (!veh) {
game.ui.sendChatMessage("pool.at - veh is null")
return null;
}
return new RageVehicle(veh);
} }
forEach(fn: (entity: IVehicle) => void): void { forEach(fn: (entity: IVehicle) => void): void {
mp.vehicles.forEach(e => { mp.vehicles.forEach(e => {
if (!e) {
game.ui.sendChatMessage("forEach - e is null");
return;
}
fn(new RageVehicle(e)); fn(new RageVehicle(e));
}) })
} }

12
ReallifeGamemode.Client/core/rage-mp/events.ts
View File

@@ -68,7 +68,12 @@ export default class RageEvents implements IEvents {
var rE: RageEntity; var rE: RageEntity;
switch (e.type) { switch (e.type) {
case 'vehicle': case 'vehicle':
rE = new RageVehicle(<VehicleMp>e); var veh = <VehicleMp>e;
if (!veh) {
game.ui.sendChatMessage("onEntityStreamIn - veh is null");
return;
}
rE = new RageVehicle(veh);
break; break;
case 'player': case 'player':
rE = new RagePlayer(<PlayerMp>e); rE = new RagePlayer(<PlayerMp>e);
@@ -81,6 +86,11 @@ export default class RageEvents implements IEvents {
onPlayerEnterVehicle(callback: (vehicle: IVehicle, seat: VehicleSeat) => void): void { onPlayerEnterVehicle(callback: (vehicle: IVehicle, seat: VehicleSeat) => void): void {
mp.events.add("playerEnterVehicle", (rV: VehicleMp, rS: number) => { mp.events.add("playerEnterVehicle", (rV: VehicleMp, rS: number) => {
if (!rV) {
game.ui.sendChatMessage("onPlayerEnterVehicle - rV is null");
return;
}
callback(new RageVehicle(rV), <VehicleSeat>(rS + 1)); callback(new RageVehicle(rV), <VehicleSeat>(rS + 1));
}); });
} }

6
ReallifeGamemode.Client/vehiclesync/vehicleindicators.ts
View File

@@ -20,8 +20,10 @@ export default function vehicleIndicators() {
mp.events.add("SERVER:setIndicatorStatus", (vehicle, left, right) => { mp.events.add("SERVER:setIndicatorStatus", (vehicle, left, right) => {
var veh = mp.vehicles.atRemoteId(vehicle); var veh = mp.vehicles.atRemoteId(vehicle);
veh.setIndicatorLights(0, right); if (veh) {
veh.setIndicatorLights(1, left); veh.setIndicatorLights(0, right);
veh.setIndicatorLights(1, left);
}
}); });
mp.events.add("entityStreamIn", entity => { mp.events.add("entityStreamIn", entity => {