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:
hydrant
2021-04-03 23:16:03 +02:00
parent 95c84ec40e df306792de
commit a8e0df3bb1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReallifeGamemode.Client/Gui/infobox.ts
View File

@@ -50,7 +50,7 @@ export default function (globalData: IGlobalData): void {
var playerName; var playerName;
var playerId; var playerId;
var playerMoney; var playerMoney = "0";
mp.events.add("draw", (pName, pId) => { mp.events.add("draw", (pName, pId) => {
playerName = pName; playerName = pName;
@@ -110,6 +110,9 @@ export default function (globalData: IGlobalData): void {
}); });
mp.events.add("updateMoney", (money) => { mp.events.add("updateMoney", (money) => {
if (money == undefined)
money = 0;
playerMoney = moneyFormat(money); playerMoney = moneyFormat(money);
}); });

2
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static List<MedicTask> ReviveTasks = new List<MedicTask>(); public static List<MedicTask> ReviveTasks = new List<MedicTask>();
public static List<MedicTask> HealTasks = new List<MedicTask>(); public static List<MedicTask> HealTasks = new List<MedicTask>();
public static List<MedicTask> FireTasks = new List<MedicTask>(); public static List<MedicTask> FireTasks = new List<MedicTask>();
public static int ReviveIncome = 500; public static int ReviveIncome = 100;
public static int dutyMedics = 0; public static int dutyMedics = 0;
public static void AddTaskToList(MedicTask task) public static void AddTaskToList(MedicTask task)