Merge branch 'hotfix/more-stuff'

This commit is contained in:
hydrant
2021-04-11 23:38:11 +02:00
2 changed files with 9 additions and 1 deletions

View File

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Report
//ChatService.BroadcastAdmin("Eingehendes Ticket von " + client.Name + ": " + message + " (Benutze /showtickets)", AdminLevel.ADMIN); //ChatService.BroadcastAdmin("Eingehendes Ticket von " + client.Name + ": " + message + " (Benutze /showtickets)", AdminLevel.ADMIN);
} }
[Command("showtickets", "~m~Benutzung: ~s~/showtickets")] [Command("showtickets", "~m~Benutzung: ~s~/showtickets", Alias = "st")]
public void CmdAdminShowtickets(Player client) public void CmdAdminShowtickets(Player client)
{ {
if (!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) if (!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)

View File

@@ -18,7 +18,15 @@ namespace ReallifeGamemode.Server.WeaponDeal
public static bool checkWeaponDbyVehicle(Vehicle vehicle) public static bool checkWeaponDbyVehicle(Vehicle vehicle)
{ {
if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData<bool>("WeaponDealLoad") == false) if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData<bool>("WeaponDealLoad") == false)
{
return false; return false;
}
if(!vehicle.HasData("weaponDeal") || vehicle.GetData<bool>("weapionDeal") == false)
{
return false;
}
return true; return true;
} }