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

/save fvehicle (factionid)

Browse Source
This commit is contained in:
hydrant
2019-09-09 21:15:45 +02:00
parent d56dbecbab
commit e8d2c02371
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -142,7 +142,8 @@ namespace ReallifeGamemode.Server.Commands
player.TriggerEvent("toggleADutyMode", true); player.TriggerEvent("toggleADutyMode", true);
} else }
else
{ {
GlobalHelper.dutyAdmins.Remove(player); GlobalHelper.dutyAdmins.Remove(player);
ChatService.Broadcast("~r~** " + player.Name + " hat sich vom Support abgemeldet"); ChatService.Broadcast("~r~** " + player.Name + " hat sich vom Support abgemeldet");
@@ -373,7 +374,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
if(!int.TryParse(timer_string, out int timer)) if (!int.TryParse(timer_string, out int timer))
{ {
ChatService.ErrorMessage(player, "Die Zeit muss eine Ganzzahl sein"); ChatService.ErrorMessage(player, "Die Zeit muss eine Ganzzahl sein");
return; return;
@@ -1012,20 +1013,20 @@ namespace ReallifeGamemode.Server.Commands
} }
#endregion #endregion
#region ALevel3 #region ALevel3
[Command("adice", "~m~Benutzung: ~s~/adice [Zahl]")] [Command("adice", "~m~Benutzung: ~s~/adice [Zahl]")]
public void CmdUserAdice(Client player, int number) public void CmdUserAdice(Client player, int number)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true)
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
} }
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player); var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player);
foreach (var managedClient in peopleInRange) foreach (var managedClient in peopleInRange)
{ {
@@ -1787,17 +1788,34 @@ namespace ReallifeGamemode.Server.Commands
case "fvehicle": case "fvehicle":
if (player.IsInVehicle) if (player.IsInVehicle)
{ {
if (player.GetUser().Faction == null) int? factionId = null;
try
{
factionId = int.Parse(option1);
}
catch (Exception) { }
if (player.GetUser().Faction == null && factionId == null)
{ {
ChatService.SendMessage(player, "~m~Du bist in keiner Fraktion! Invite dich erst mit ~y~/ainvite"); ChatService.SendMessage(player, "~m~Du bist in keiner Fraktion! Invite dich erst mit ~y~/ainvite");
return; return;
} }
else else
{ {
if (factionId != null)
{
using (var dbContext = new DatabaseContext())
{
if (dbContext.Factions.Where(f => f.Id == factionId).Count() == 0)
{
ChatService.ErrorMessage(player, "Diese Fraktion existiert nicht");
return;
}
}
}
Vehicle vehicle = player.Vehicle; Vehicle vehicle = player.Vehicle;
int playerSeat = player.VehicleSeat; int playerSeat = player.VehicleSeat;
vehicle = SaveManager.SaveFactionVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, vehicle = SaveManager.SaveFactionVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, player.GetUser().FactionId.Value, vehicle.Livery); vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, factionId ?? player.GetUser().FactionId.Value, vehicle.Livery);
player.SendNotification("Fraktionsfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true); player.SendNotification("Fraktionsfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true);
player.SetIntoVehicle(vehicle, playerSeat); player.SetIntoVehicle(vehicle, playerSeat);
} }
@@ -2594,7 +2612,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
if(nearHouse.OwnerId != null) if (nearHouse.OwnerId != null)
{ {
dbContext.Users.Where(u => u.Id == nearHouse.OwnerId).First().HouseId = null; dbContext.Users.Where(u => u.Id == nearHouse.OwnerId).First().HouseId = null;
} }