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

Merge branch 'develop'

Browse Source
This commit is contained in:
hydrant
2021-05-27 23:58:42 +02:00
parent f9937deff6 099f322fa9
commit 424de9d021
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReallifeGamemode.Client/drugs/hanf.ts
View File

@@ -333,9 +333,15 @@ export default function hanfSystem(globalData: IGlobalData) {
let hanfDataIdToObjectMap: Map<number, ObjectMp> = new Map<number, ObjectMp>(); let hanfDataIdToObjectMap: Map<number, ObjectMp> = new Map<number, ObjectMp>();
let hanfDataIdToTextLabelMap: Map<number, TextLabelMp> = new Map<number, TextLabelMp>(); let hanfDataIdToTextLabelMap: Map<number, TextLabelMp> = new Map<number, TextLabelMp>();
mp.events.add("SERVER:Hanf_UpdateHanfData", dataJson => { mp.events.addDataHandler("hanfData", (entity: EntityMp, value) => {
mp.console.logInfo(dataJson); mp.gui.chat.push("neue hanf data");
if (entity.type == 'player' && entity.remoteId == mp.players.local.remoteId) {
mp.gui.chat.push("eigener user");
updateHanf(value);
}
});
function updateHanf(dataJson: string) {
var data: Array<CannabisData> = <Array<CannabisData>>JSON.parse(dataJson) var data: Array<CannabisData> = <Array<CannabisData>>JSON.parse(dataJson)
var newPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 0); var newPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 0);
@@ -378,7 +384,7 @@ export default function hanfSystem(globalData: IGlobalData) {
}); });
currentHanfData = data; currentHanfData = data;
}); }
function getPlantModel(plant: CannabisData): number { function getPlantModel(plant: CannabisData): number {
var diff = Date.now() - Date.parse(plant.Time); var diff = Date.now() - Date.parse(plant.Time);

3
ReallifeGamemode.Server/Managers/HanfManager.cs
View File

@@ -289,7 +289,8 @@ namespace ReallifeGamemode.Server.Managers
{ {
cannabisData ??= _currentCannabisData; cannabisData ??= _currentCannabisData;
await NAPI.Task.WaitForMainThread(); await NAPI.Task.WaitForMainThread();
player.TriggerEvent("SERVER:Hanf_UpdateHanfData", JsonConvert.SerializeObject(cannabisData)); player.SetSharedData("hanfData", JsonConvert.SerializeObject(cannabisData));
//player.TriggerEvent("SERVER:Hanf_UpdateHanfData");
} }
[RemoteEvent("CLIENT:Hanf_BuySeeds")] [RemoteEvent("CLIENT:Hanf_BuySeeds")]