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

Merged 'develop' into feature

Browse Source
This commit is contained in:
hydrant
2018-09-23 21:13:00 +02:00
parent bac725f2dc 1538b41ffb
commit 06715d7df4
34 changed files with 739 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Server/Commands/Admin.cs
View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities;
using reallife_gamemode.Server.Events;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Services;
using reallife_gamemode.Server.Util;
@@ -46,7 +45,7 @@ namespace reallife_gamemode.Server.Commands
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan schon in einem Fahrzeug.");
return;
}
Vehicle v = NAPI.Vehicle.CreateVehicle(hash, player.Position, player.Rotation.Z, color1, color2);
player.SetIntoVehicle(v.Handle, -1);
@@ -102,7 +101,7 @@ namespace reallife_gamemode.Server.Commands
Client target = ClientService.GetClientByName(name);
if(target == null)
if (target == null)
{
ChatService.PlayerNotFound(player);
return;
@@ -153,13 +152,13 @@ namespace reallife_gamemode.Server.Commands
}
option = option.ToLower();
if(option == "load")
if (option == "load")
{
NAPI.World.RequestIpl(name);
player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich geladen");
}
else if(option == "remove")
else if (option == "remove")
{
NAPI.World.RemoveIpl(name);
player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich entladen");
@@ -194,7 +193,7 @@ namespace reallife_gamemode.Server.Commands
WeaponHash wHash = NAPI.Util.WeaponNameToModel(weapon);
if(wHash == default(WeaponHash))
if (wHash == default(WeaponHash))
{
player.SendChatMessage("~r~[FEHLER]~s~ Diese Waffe existiert nicht.");
return;
@@ -241,7 +240,7 @@ namespace reallife_gamemode.Server.Commands
using (var dbContext = new DatabaseContext())
{
Entities.Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == faction);
if(f == null && faction != 0)
if (f == null && faction != 0)
{
player.SendChatMessage("~r~[FEHLER]~s~ Diese Fraktion existiert nicht (Liste: ~m~/factionlist).");
return;
@@ -249,7 +248,7 @@ namespace reallife_gamemode.Server.Commands
User u = dbContext.Users.SingleOrDefault(x => x.Name == target.Name);
if(faction != 0)
if (faction != 0)
{
u.FactionId = f.Id;
u.FactionRankId = dbContext.FactionRanks.
@@ -270,5 +269,29 @@ namespace reallife_gamemode.Server.Commands
dbContext.SaveChanges();
}
}
[Command("save", "~m~Benutzung: ~s~/save [Typ = ~g~Blip, ~r~Marker, Ped, Pickup, TextLabel, ~g~Vehicle")]
public void CmdAdminSave(Client player, string typ)
{
switch (typ)
{
case "Blip":
player.TriggerEvent("saveBlip");
break;
case "Ped":
break;
case "Vehicle":
if (player.IsInVehicle)
{
Vehicle vehicle = player.Vehicle;
SaveData.SaveVehicleData((VehicleHash) vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, vehicle.EngineStatus, Convert.ToByte(vehicle.Dimension));
}
else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
break;
}
}
}
}