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

evtl fix hanf

Browse Source
This commit is contained in:
hydrant
2021-05-27 23:50:21 +02:00
parent 50fb50f9f0
commit acb2cbc9ba
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,11 +335,11 @@ export default function hanfSystem(globalData: IGlobalData) {
mp.events.addDataHandler("hanfData", (entity: EntityMp, value) => { mp.events.addDataHandler("hanfData", (entity: EntityMp, value) => {
if (entity == mp.players.local) { if (entity == mp.players.local) {
updateHanf(value);
} }
}); });
mp.events.add("SERVER:Hanf_UpdateHanfData", dataJson => { 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);
@@ -382,7 +382,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);

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

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