fix hanf
This commit is contained in:
@@ -333,9 +333,19 @@ export default function hanfSystem(globalData: IGlobalData) {
|
||||
let hanfDataIdToObjectMap: Map<number, ObjectMp> = new Map<number, ObjectMp>();
|
||||
let hanfDataIdToTextLabelMap: Map<number, TextLabelMp> = new Map<number, TextLabelMp>();
|
||||
|
||||
mp.events.add("SERVER:Hanf_UpdateHanf", (dataJsonArr: string[]) => {
|
||||
var dataJson = dataJsonArr.join('');
|
||||
var data: Array<CannabisData> = <Array<CannabisData>>JSON.parse(dataJson)
|
||||
let currentHanfUpdateJsonData: Map<number, string> = new Map<number, string>();
|
||||
|
||||
mp.events.add("SERVER:Hanf_UpdateHanf", (currentIndex: number, totalData: number, currentData: string) => {
|
||||
currentHanfUpdateJsonData.set(currentIndex, currentData);
|
||||
if (currentHanfUpdateJsonData.size == totalData) {
|
||||
var jsonData: string = "";
|
||||
for (var i = 0; i < totalData; i++) {
|
||||
jsonData += currentHanfUpdateJsonData.get(i);
|
||||
}
|
||||
|
||||
currentHanfUpdateJsonData.clear();
|
||||
|
||||
var data: Array<CannabisData> = <Array<CannabisData>>JSON.parse(jsonData)
|
||||
|
||||
var newPlants = data.filter(d => currentHanfData.filter(x => x.Id === d.Id).length == 0);
|
||||
var removedPlants = currentHanfData.filter(d => data.filter(x => x.Id === d.Id).length == 0);
|
||||
@@ -377,6 +387,7 @@ export default function hanfSystem(globalData: IGlobalData) {
|
||||
});
|
||||
|
||||
currentHanfData = data;
|
||||
}
|
||||
});
|
||||
|
||||
function getPlantModel(plant: CannabisData): number {
|
||||
|
||||
@@ -281,21 +281,29 @@ namespace ReallifeGamemode.Server.Managers
|
||||
}).ToList();
|
||||
|
||||
_currentCannabisData = activePlants;
|
||||
|
||||
NAPI.Pools.GetAllPlayers().ForEach(p =>
|
||||
{
|
||||
UpdateHanfForPlayer(p, activePlants);
|
||||
});
|
||||
UpdateHanfForPlayer();
|
||||
}
|
||||
|
||||
public static void UpdateHanfForPlayer(Player player, List<CannabisData> cannabisData = null)
|
||||
public static void UpdateHanfForPlayer(Player player = null, List<CannabisData> cannabisData = null)
|
||||
{
|
||||
cannabisData ??= _currentCannabisData;
|
||||
|
||||
string jsonStr = JsonConvert.SerializeObject(cannabisData);
|
||||
List<string> parts = GetChunks(jsonStr, 500);
|
||||
string[] parts = GetChunks(jsonStr, 5000).ToArray();
|
||||
|
||||
player.TriggerEvent("SERVER:Hanf_UpdateHanf", parts);
|
||||
int totalData = parts.Length;
|
||||
|
||||
for (int i = 0; i < totalData; i++)
|
||||
{
|
||||
if (player != null)
|
||||
{
|
||||
player.TriggerEvent("SERVER:Hanf_UpdateHanf", i, totalData, parts[i]);
|
||||
}
|
||||
else
|
||||
{
|
||||
NAPI.ClientEvent.TriggerClientEventForAll("SERVER:Hanf_UpdateHanf", i, totalData, parts[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static List<string> GetChunks(string value, int chunkSize)
|
||||
@@ -648,6 +656,8 @@ namespace ReallifeGamemode.Server.Managers
|
||||
InventoryManager.RemoveUserItem(user, cannabisUserItem, amount);
|
||||
dbContext.SaveChanges();
|
||||
|
||||
dbContext.SaveChanges();
|
||||
|
||||
logger.LogInformation("Player {0} sold {1} cannabis to the server for {2} dollars", player.Name, amount, price);
|
||||
|
||||
player.SendNotification($"Du hast ~g~{amount} Hanfblüten~s~ für ~g~{price.ToMoneyString()}~s~ verkauft");
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace ReallifeGamemode.Server.Util
|
||||
{ "balboistderbeste", "Hurra! Hurra! Der Balbo ist jetzt da! (balbo)" },
|
||||
{ "AirMake", "The fresh breeze of the stone is back. (AirMake)" },
|
||||
{ "raviatex", "I'll remember you all in therapy. (aviate)" },
|
||||
{ "datgame__", "KOPF ENTWICKLUNG!! (hydrant)" },
|
||||
{ "datgame__", "ja (hydrant)" },
|
||||
{ "Roachkook", "2head Entwickler ist wieder online (kookroach)" }
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user