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

RAGE Multiplayer 1.1.0-DP Update

Browse Source 
/freeze was obselete and removed
/unfreeze was obselete and removed
/spectate was obselete and removed
This commit is contained in:
Siga
2020-02-24 21:18:54 +01:00
parent 0d5731fb11
commit edf06f4478
85 changed files with 804 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReallifeGamemode.Server/Managers/ATMManager.cs
View File

@@ -73,26 +73,26 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
public static void EnterATMRange(ColShape colShape, Client client)
public static void EnterATMRange(ColShape colShape, Player client)
{
client.SetData("nearATM", colShape.GetData("id"));
client.SetData("nearATM", colShape.GetData<int>("id"));
}
public static void ExitATMRange(ColShape colShape, Client client)
public static void ExitATMRange(ColShape colShape, Player client)
{
client.ResetData("nearATM");
}
public static void ShowAtmUi(Client player, int atmId)
public static void ShowAtmUi(Player player, int atmId)
{
player.TriggerEvent("SERVER:ShowAtmUi", atmId);
}
[RemoteEvent("CLIENT:ATM_MANAGER:ATM_ACTION")]
public void AtmAction(Client client, int site, int inputField1, int inputField2)
public void AtmAction(Player client, int site, int inputField1, int inputField2)
{
var user = client.GetUser();
using (var dbContext = new DatabaseContext())
{
int nearATM = client.GetData("nearATM");
int nearATM = client.GetData<int>("nearATM");
//SITE //0 Geld einzahlen //1 Geld auszahlen //2 Geld überweisen
switch (site)
{

2
ReallifeGamemode.Server/Managers/BankManager.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Managers
{
public class BankManager
{
public static TransactionResult SetMoney(Client admin, IBankAccountOwner owner, int amount, string reason = "Von Admin gesetzt")
public static TransactionResult SetMoney(Player admin, IBankAccountOwner owner, int amount, string reason = "Von Admin gesetzt")
{
using (var transferMoney = new DatabaseContext())
{

18
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -50,13 +50,13 @@ namespace ReallifeGamemode.Server.Managers
return Businesses.Find(b => b.Id == id);
}
public static BusinessBase GetNearBusiness(Client player)
public static BusinessBase GetNearBusiness(Player player)
{
return Businesses.Where(b => b.Position.DistanceTo(player.Position) < 5f).FirstOrDefault();
}
[RemoteEvent("Business_DepositMoney")]
public void BusinessDepositMoney(Client player, int amount)
public void BusinessDepositMoney(Player player, int amount)
{
User user = player.GetUser();
if (user == null)
@@ -80,14 +80,14 @@ namespace ReallifeGamemode.Server.Managers
}
else if (result == TransactionResult.SUCCESS)
{
playerBusiness.SendBusinessDataToClient(player);
playerBusiness.SendBusinessDataToPlayer(player);
player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");
return;
}
}
[RemoteEvent("Business_WithdrawMoney")]
public void BusinessWithdrawMoney(Client player, int amount)
public void BusinessWithdrawMoney(Player player, int amount)
{
User user = player.GetUser();
if (user == null)
@@ -111,14 +111,14 @@ namespace ReallifeGamemode.Server.Managers
}
else if (result == TransactionResult.SUCCESS)
{
playerBusiness.SendBusinessDataToClient(player);
playerBusiness.SendBusinessDataToPlayer(player);
player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");
return;
}
}
[ServerEvent(Event.PlayerEnterVehicle)]
public void CarDealerBusiness_PlayerEnterVehicle(Client player, Vehicle veh, int seat)
public void CarDealerBusiness_PlayerEnterVehicle(Player player, Vehicle veh, int seat)
{
ServerVehicle sVeh = veh.GetServerVehicle();
if (sVeh == null) return;
@@ -137,7 +137,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("VehShop_BuyVehicle")]
public void CarDealerBusiness_BuyVehicle(Client player, string target)
public void CarDealerBusiness_BuyVehicle(Player player, string target)
{
ServerVehicle sVeh = player.Vehicle?.GetServerVehicle();
if (sVeh == null) return;
@@ -217,7 +217,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:Business_BuyBusiness")]
public void BusinessEventBuyBusiness(Client player)
public void BusinessEventBuyBusiness(Player player)
{
BusinessBase business = GetNearBusiness(player);
if (business == null) return;
@@ -258,7 +258,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:Business_SellBusiness")]
public void BusinessEventSellBusiness(Client player)
public void BusinessEventSellBusiness(Player player)
{
BusinessBase business = GetNearBusiness(player);
if (business == null) return;

6
ReallifeGamemode.Server/Managers/CharacterCreator.cs
View File

@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("creatorSave")]
public void CreatorSave(Client player, bool gender, string parentData, string featureData, string appearanceData, string hairAndColorData)
public void CreatorSave(Player player, bool gender, string parentData, string featureData, string appearanceData, string hairAndColorData)
{
var jParentData = JObject.Parse(parentData);
var jFeatureData = JArray.Parse(featureData);
@@ -178,8 +178,8 @@ namespace ReallifeGamemode.Server.Managers
/// <summary>
/// Wendet den Character eines Spielers auf diesen an
/// </summary>
/// <param name="player">Der Client, dessen Aussehen man setzen will</param>
public static void ApplyCharacter(Client player)
/// <param name="player">Der Player, dessen Aussehen man setzen will</param>
public static void ApplyCharacter(Player player)
{
var userId = player.GetUser().Id;
using (var loadCharacter = new DatabaseContext())

2
ReallifeGamemode.Server/Managers/CityHallManager.cs
View File

@@ -35,7 +35,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:CityHall_CreateGroup")]
public void CreateGroup(Client player, string name)
public void CreateGroup(Player player, string name)
{
using (var dbContext = new DatabaseContext())
{

4
ReallifeGamemode.Server/Managers/DoorManager.cs
View File

@@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Managers
LoadDoors();
}
public static void ChangeDoorState(Client player)
public static void ChangeDoorState(Player player)
{
var user = player.GetUser();
@@ -68,7 +68,7 @@ namespace ReallifeGamemode.Server.Managers
}
[ServerEvent(Event.PlayerEnterColshape)]
public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Client player)
public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Player player)
{
if (_doorColShapes.ContainsValue(colShape.Handle))
{

38
ReallifeGamemode.Server/Managers/HouseManager.cs
View File

@@ -12,14 +12,14 @@ using System.Text;
namespace ReallifeGamemode.Server.Managers
{
class HouseManager : Script
class HouseManager
{
private static readonly Dictionary<int, NetHandle> houseMarkers = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseLabels = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseColShapes = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseBlips = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, List<Client>> playerInColShape = new Dictionary<int, List<Client>>();
private static readonly Dictionary<int, List<Player>> playerInColShape = new Dictionary<int, List<Player>>();
public static async void LoadHouses()
{
@@ -99,7 +99,7 @@ namespace ReallifeGamemode.Server.Managers
{
if (loadUser) house = house.Refresh();
playerInColShape[house.Id] = new List<Client>();
playerInColShape[house.Id] = new List<Player>();
houseMarkers[house.Id] = NAPI.Marker.CreateMarker(MarkerType.VerticalCylinder, house.Position.Subtract(new Vector3(0, 0, 1.7)), new Vector3(), new Vector3(), 1.6f, new Color(255, 255, 255));
string text = $"~g~Zum Verkauf\n~s~{house.Type}\nPreis: ~y~{(house.Price == 0 ? "~r~Nicht verkäuflich" : house.Price.ToMoneyString())}";
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
private static void HouseManager_OnEntityExitColShape(ColShape colShape, Client client)
private static void HouseManager_OnEntityExitColShape(ColShape colShape, Player client)
{
if (!client.IsLoggedIn() || client.IsInVehicle) return;
if (!houseColShapes.ContainsValue(colShape.Handle))
@@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Managers
client.TriggerEvent("SERVER:CloseHouseMenu");
}
private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Client client)
private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Player client)
{
if (!client.IsLoggedIn() || client.IsInVehicle) return;
if (!houseColShapes.ContainsValue(colShape.Handle))
@@ -153,10 +153,10 @@ namespace ReallifeGamemode.Server.Managers
User user = client.GetUser();
client.TriggerEvent("SERVER:ShowHouseMenu");
SendClientHouseData(client, house);
SendPlayerHouseData(client, house);
}
private static void SendClientHouseData(Client player, House house)
private static void SendPlayerHouseData(Player player, House house)
{
User user = player.GetUser();
var userHouseStatus = -1;
@@ -208,14 +208,14 @@ namespace ReallifeGamemode.Server.Managers
houseBlips.Remove(house.Id);
}
foreach (Client client in playerInColShape[house.Id])
foreach (Player client in playerInColShape[house.Id])
{
client.TriggerEvent("SERVER:CloseHouseMenu");
}
}
[RemoteEvent("CLIENT:House_BuyHouse")]
public void HouseManagerBuyHouseEvent(Client player)
public void HouseManagerBuyHouseEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -250,7 +250,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:House_SetRentalFee")]
public void HouseManagerSetRentalFeeEvent(Client player, int rentalFee)
public void HouseManagerSetRentalFeeEvent(Player player, int rentalFee)
{
using (var dbContext = new DatabaseContext())
{
@@ -276,7 +276,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:House_CancelUserRental")]
public void HouseManagerCancelUserRentalEvent(Client player, string userName)
public void HouseManagerCancelUserRentalEvent(Player player, string userName)
{
using (var dbContext = new DatabaseContext())
{
@@ -306,15 +306,15 @@ namespace ReallifeGamemode.Server.Managers
dbContext.HouseRentals.Remove(rental);
dbContext.SaveChanges();
target.Client?.SendNotification($"~y~{player.Name}~s~ hat deinen Mietvertrag ~g~gekündigt~s~.");
target.Player?.SendNotification($"~y~{player.Name}~s~ hat deinen Mietvertrag ~g~gekündigt~s~.");
player.SendNotification("Du hast dem Spieler ~y~" + target.Name + "~s~ den Mietvertrag gekündigt.");
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
[RemoteEvent("CLIENT:House_RentInHouse")]
public void HouseManagerRentInHouseEvent(Client player)
public void HouseManagerRentInHouseEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -340,12 +340,12 @@ namespace ReallifeGamemode.Server.Managers
player.SendNotification("~g~Du hast dich in das Haus eingemietet");
house.User?.SendNotification($"~y~{player.Name}~s~ hat sich in dein Haus eingemietet.");
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
[RemoteEvent("CLIENT:House_CancelOwnRental")]
public void HouseManagerCancelOwnRentalEvent(Client player)
public void HouseManagerCancelOwnRentalEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -376,12 +376,12 @@ namespace ReallifeGamemode.Server.Managers
RemoveHouse(house);
LoadHouse(house);
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
[RemoteEvent("CLIENT:House_SellHouse")]
public void HouseManagerSellHouseEvent(Client player)
public void HouseManagerSellHouseEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -404,7 +404,7 @@ namespace ReallifeGamemode.Server.Managers
RemoveHouse(house);
LoadHouse(house);
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
}

32
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Managers
#endregion
#region Eigeninteraktionen PFEILTASTE-RUNTER
[RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")]
public void InteractionMenuAcceptInvite(Client player, string type)
public void InteractionMenuAcceptInvite(Player player, string type)
{
if (type != "Fraktion" && type != "Gruppe") return;
@@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Managers
return;
}
Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_faction_invite"));
Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData<NetHandle>("accept_faction_invite"));
player.ResetData("accept_faction_invite");
if (leader == null)
@@ -91,7 +91,7 @@ namespace ReallifeGamemode.Server.Managers
return;
}
Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_group_invite"));
Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData<NetHandle>("accept_group_invite"));
player.ResetData("accept_group_invite");
if (leader == null)
@@ -116,18 +116,18 @@ namespace ReallifeGamemode.Server.Managers
}
}
[RemoteEvent("CLIENT:InteractionMenu_EndShow")]
public void InteractionMenuEndShow(Client client)
public void InteractionMenuEndShow(Player client)
{
client.ResetData("ShowActive");
}
[RemoteEvent("CLIENT:InteractionMenu_Show")]
public void InteractionMenuShow(Client player, string type, string nameOrId)
public void InteractionMenuShow(Player player, string type, string nameOrId)
{
if (type != "License")
return;
Client target = ClientService.GetClientByNameOrId(nameOrId);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -163,11 +163,11 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:InteractionMenu_Invite")]
public void InteractionMenuInviteFaction(Client player, string type, string nameOrId)
public void InteractionMenuInviteFaction(Player player, string type, string nameOrId)
{
if (type != "Fraktion" && type != "Gruppe") return;
Client target = ClientService.GetClientByNameOrId(nameOrId);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -220,11 +220,11 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:InteractionMenu_Uninvite")]
public void InteractionMenuInviteGroup(Client player, string type, string name)
public void InteractionMenuInviteGroup(Player player, string type, string name)
{
if (type != "Fraktion" && type != "Gruppe") return;
Client target = ClientService.GetClientByNameOrId(name);
Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -313,7 +313,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:InteractionMenu_CallService_Taxi")]
public void CallServiceTaxi(Client player, string street, string zone)
public void CallServiceTaxi(Player player, string street, string zone)
{
var taxiJob = JobManager.GetJob<TaxiDriverJob>();
@@ -336,27 +336,27 @@ namespace ReallifeGamemode.Server.Managers
#endregion
#region Spielerinteraktionen PFEILTASTE-LINKS
[RemoteEvent("openTradeInventory")]
public void OpenTradeInventory(Client player, string targetPlayer)
public void OpenTradeInventory(Player player, string targetPlayer)
{
InventoryManager.GetUserItems(player);
player.TriggerEvent("openTradeMenu", targetPlayer);
}
[RemoteEvent("sendTradeItemsToPartner")]
public void SendTradeItemsToPartner(Client player, string tradeItemArray, int tradePrize, string tradePartnerName)
public void SendTradeItemsToPartner(Player player, string tradeItemArray, int tradePrize, string tradePartnerName)
{
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradePartner = ClientService.GetClientByNameOrId(tradePartnerName);
Player tradePartner = PlayerService.GetPlayerByNameOrId(tradePartnerName);
InventoryManager.GetUserItems(player);
tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize);
player.TriggerEvent("startTradeRequestTimer");
}
[RemoteEvent("tradeDecision")]
public void TradeDecision(Client player, string tradeSelection, string tradeItemArray, string tradeRequesterName, int tradePrize)
public void TradeDecision(Player player, string tradeSelection, string tradeItemArray, string tradeRequesterName, int tradePrize)
{
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName);
Player tradeRequester = PlayerService.GetPlayerByNameOrId(tradeRequesterName);
if (tradeSelection == "accept")
{
if (player.GetUser().Handmoney < tradePrize)

6
ReallifeGamemode.Server/Managers/InteriorManager.cs
View File

@@ -110,7 +110,7 @@ namespace ReallifeGamemode.Server.Managers
public static int GetInteriorIdFromExitColShape(NetHandle handle) => _interiorExitColShapes.FirstOrDefault(c => c.Value.Value == handle.Value).Key;
[ServerEvent(Event.PlayerEnterColshape)]
public void InteriorManagerPlayerEnterColshapeEvent(ColShape colShape, Client player)
public void InteriorManagerPlayerEnterColshapeEvent(ColShape colShape, Player player)
{
int enterId = GetInteriorIdFromEnterColShape(colShape);
int exitId = GetInteriorIdFromExitColShape(colShape);
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Managers
}
[ServerEvent(Event.PlayerExitColshape)]
public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Client player)
public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Player player)
{
if (GetInteriorIdFromEnterColShape(colShape) != 0 || GetInteriorIdFromExitColShape(colShape) != 0)
{
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("InteriorManager_UseTeleport")]
public void InteriorManagerUseTeleportEvent(Client player, int id, int enterExit)
public void InteriorManagerUseTeleportEvent(Player player, int id, int enterExit)
{
Interior interior = GetInteriorById(id);
player.Position = enterExit == 0 ? interior.ExitPosition : interior.EnterPosition;

62
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public static void GetUserItems(Client player)
public static void GetUserItems(Player player)
{
var user = player.GetUser();
var inventoryWeight = 0;
@@ -106,7 +106,7 @@ namespace ReallifeGamemode.Server.Managers
iId.Add(iItem.Id);
}
List<Client> targetList = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
List<Player> targetList = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
List<string> username = new List<string>();
foreach (var target in targetList)
{
@@ -118,7 +118,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public static int GetUserInventoryWeight(Client player)
public static int GetUserInventoryWeight(Player player)
{
var user = player.GetUser();
var inventoryWeight = 0;
@@ -157,7 +157,7 @@ namespace ReallifeGamemode.Server.Managers
return inventoryWeight;
}
public static UserItem UserHasThisItem(Client player, int itemId)
public static UserItem UserHasThisItem(Player player, int itemId)
{
var user = player.GetUser();
using (var context = new DatabaseContext())
@@ -167,7 +167,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public static void GetUserItemsAsAdmin(Client player, User user)
public static void GetUserItemsAsAdmin(Player player, User user)
{
var inventoryWeight = 0;
@@ -193,7 +193,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public bool CheckOriginOfItem(Client client, string jsonItemID, string jsonItemAmount, string jsonOrigin, string jsonVehAmount)
public bool CheckOriginOfItem(Player client, string jsonItemID, string jsonItemAmount, string jsonOrigin, string jsonVehAmount)
{
var origin = JsonConvert.DeserializeObject<int[]>(jsonOrigin);
var itemID = JsonConvert.DeserializeObject<int>(jsonItemID);
@@ -359,7 +359,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("saveVehicleInventory")]
public void SaveVehicleInventory(Client player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
public void SaveVehicleInventory(Player player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
{
var itemID = JsonConvert.DeserializeObject<int>(jsonItemID);
var itemAmount = JsonConvert.DeserializeObject<int>(jsonItemAmount);
@@ -400,7 +400,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("saveInventory")]
public void SavePlayerInventory(Client player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
public void SavePlayerInventory(Player player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
{
var user = player.GetUser();
@@ -443,7 +443,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public static void AddItemToInventory(Client player, UserItem item)
public static void AddItemToInventory(Player player, UserItem item)
{
var user = player.GetUser();
using (var context = new DatabaseContext())
@@ -477,7 +477,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public static void AddItemToVehicleInventory(Client player, VehicleItem item, Vehicle veh)
public static void AddItemToVehicleInventory(Player player, VehicleItem item, Vehicle veh)
{
var user = player.GetUser();
using (var context = new DatabaseContext())
@@ -525,13 +525,13 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("removeItemAsAdmin")]
public void RemoveAsAdminInventory(Client player, string amount, string userItemId, string targetPlayerName)
public void RemoveAsAdminInventory(Player player, string amount, string userItemId, string targetPlayerName)
{
using (var context = new DatabaseContext())
{
UserItem fItem = context.UserItems.FirstOrDefault(j => j.Id == int.Parse(userItemId));
Client targetPlayer = ClientService.GetClientByNameOrId(targetPlayerName);
Player targetPlayer = PlayerService.GetPlayerByNameOrId(targetPlayerName);
if (amount == "stack")
{
@@ -550,7 +550,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("itemInteract")]
public void ItemInteract(Client player, string jsonType, string jsonAmount, string jsonItemId)
public void ItemInteract(Player player, string jsonType, string jsonAmount, string jsonItemId)
{
int amount = JsonConvert.DeserializeObject<int>(jsonAmount);
int itemId = JsonConvert.DeserializeObject<int>(jsonItemId);
@@ -602,7 +602,7 @@ namespace ReallifeGamemode.Server.Managers
if (iItem is IDroppableItem usableItemObj2)
{
Vector3 dropPosition = ClientExtension.GetPositionFromPlayer(player, 0.6f, 0);
Vector3 dropPosition = PlayerExtension.GetPositionFromPlayer(player, 0.6f, 0);
//new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f);
Random r = new Random();
GTANetworkAPI.Object grndObject;
@@ -638,11 +638,11 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("tradeItem")]
public void ServerEvent_tradeItem(Client client, int value, string jsonNameOrId, string itemIdArrStr, string itemAmountArrStr)
public void ServerEvent_tradeItem(Player client, int value, string jsonNameOrId, string itemIdArrStr, string itemAmountArrStr)
{
User user = client.GetUser();
string nameOrId = JsonConvert.DeserializeObject<string>(jsonNameOrId);
Client target = ClientService.GetClientByNameOrId(nameOrId);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn() || target == client)
{
ChatService.PlayerNotFound(client);
@@ -658,7 +658,7 @@ namespace ReallifeGamemode.Server.Managers
List<string> itemNameList = new List<string>();
if (target.HasData("inTrade") && target.GetData("inTrade") == true)
if (target.HasData("inTrade") && target.GetData<bool>("inTrade") == true)
{
ChatService.SendMessage(client, $"~r~[FEHLER] ~w~{target.Name} befindet sich bereits in einem Handel.");
return;
@@ -710,7 +710,7 @@ namespace ReallifeGamemode.Server.Managers
target.TriggerEvent("addTradeItems", itemIdArr, itemAmountArr, itemNameList.ToArray(), inventoryWeight);
}
public void SendTradeOffer(Client client, Client sender)
public void SendTradeOffer(Player client, Player sender)
{
client.SetData("inTrade", true);
sender.SetData("inTrade", true);
@@ -723,7 +723,7 @@ namespace ReallifeGamemode.Server.Managers
tradeTimer.Elapsed += (s, e) => { SendBackToSender(sender); client.SetData("inTrade", false); sender.SetData("inTrade", false); client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0)); };
}
public void SendBackToSender(Client client)
public void SendBackToSender(Player client)
{
User user = client.GetUser();
ChatService.SendMessage(client, "Dein Handelspartner hat die Anfrage nicht angenommen.");
@@ -759,16 +759,16 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("declineTrade")]
public void ServerEvent_declineTrade(Client client)
public void ServerEvent_declineTrade(Player client)
{
client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0));
if (!client.GetData("inTrade"))
if (!client.GetData<bool>("inTrade"))
{
ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen.");
return;
}
string name = client.GetData("trade");
Client target = ClientService.GetClientByNameOrId(name);
string name = client.GetData<string>("trade");
Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(client);
@@ -780,10 +780,10 @@ namespace ReallifeGamemode.Server.Managers
SendBackToSender(target);
}
public static void OpenTradeAccept(Client client)
public static void OpenTradeAccept(Player client)
{
User user = client.GetUser();
int id = client.GetData("tradePartner");
int id = client.GetData<int>("tradePartner");
(int[] itemIdArr, int[] itemAmountArr) = TradeItems[id];
Timer tradeTimer = TradeTimer[id];
tradeTimer.Stop();
@@ -792,9 +792,9 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("acceptTrade")]
public void ServerEvent_AcceptTrade(Client client)
public void ServerEvent_AcceptTrade(Player client)
{
if (!client.GetData("inTrade"))
if (!client.GetData<bool>("inTrade"))
{
ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen.");
return;
@@ -803,12 +803,12 @@ namespace ReallifeGamemode.Server.Managers
client.SetData("inTrade", false);
User user = client.GetUser();
int id = client.GetData("tradePartner");
int id = client.GetData<int>("tradePartner");
(int[] itemIdArr, int[] itemAmountArr) = TradeItems[id];
Timer tradeTimer = TradeTimer[id];
tradeTimer.Stop();
string name = client.GetData("trade");
Client target = ClientService.GetClientByNameOrId(name);
string name = client.GetData<string>("trade");
Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(client);
@@ -865,7 +865,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("SERVER:BuyItems")]
public void SrvEvent_BuyItem(Client client, string itemName)
public void SrvEvent_BuyItem(Player client, string itemName)
{
IItem shopItem = GetItemByName(itemName);

20
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Managers
public static List<JobBase> GetJobs() => _jobs.OrderBy(j => j.Id).ToList();
[RemoteEvent("CLIENT:JobCenter_CancelJob")]
public void CancelJobEvent(Client player)
public void CancelJobEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:JobCenter_AcceptJob")]
public void AcceptJobEvent(Client player, int jobId)
public void AcceptJobEvent(Player player, int jobId)
{
using (var dbContext = new DatabaseContext())
{
@@ -100,7 +100,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:JobManager_ShowJobMenu")]
public void ShowJobMenuEvent(Client player)
public void ShowJobMenuEvent(Player player)
{
User u = player.GetUser();
@@ -153,7 +153,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:Job_StartJob")]
public void StartJobEvent(Client player)
public void StartJobEvent(Player player)
{
User u = player.GetUser();
@@ -177,7 +177,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:Job_StopJob")]
public void StopJob(Client player)
public void StopJob(Player player)
{
User u = player.GetUser();
@@ -200,7 +200,7 @@ namespace ReallifeGamemode.Server.Managers
}
[ServerEvent(Event.PlayerExitVehicle)]
public void JobManagerPlayerExitVehicle(Client player, Vehicle veh)
public void JobManagerPlayerExitVehicle(Player player, Vehicle veh)
{
User u = player.GetUser();
@@ -216,7 +216,7 @@ namespace ReallifeGamemode.Server.Managers
}
[ServerEvent(Event.PlayerEnterVehicle)]
public void JobManagerPlayerEnterVehicle(Client player, Vehicle veh, sbyte seat)
public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat)
{
ServerVehicle sVeh = veh.GetServerVehicle();
if (sVeh == null) return;
@@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Managers
var contract = taxiContracts.First();
taxiJob.TaxiContracts.Remove(contract);
Client driver = veh.GetDriver();
Player driver = veh.GetDriver();
if (driver != null && contract.Driver.Handle != veh.GetDriver().Handle)
{
@@ -241,7 +241,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")]
public void TaxiJobAcceptCall(Client player, string name)
public void TaxiJobAcceptCall(Player player, string name)
{
var taxiJob = JobManager.GetJob<TaxiDriverJob>();
@@ -253,7 +253,7 @@ namespace ReallifeGamemode.Server.Managers
var job = taxiJob.TaxiContracts.Where(t => t.Name == name).First();
var target = ClientService.GetClientByNameOrId(name);
var target = PlayerService.GetPlayerByNameOrId(name);
if (target == null)
{
taxiJob.TaxiContracts.Remove(job);

6
ReallifeGamemode.Server/Managers/SaveManager.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Managers
{
[RemoteEvent("OnSaveBlipData")]
public static void OnSaveBlipData(Client player, string blipSprite, string blipName, string blipScale, string blipColor,
public static void OnSaveBlipData(Player player, string blipSprite, string blipName, string blipScale, string blipColor,
string blipAlpha, string blipDrawDistance, string blipShortRange, string blipRotation, string blipDimension)
{
float x = player.Position.X;
@@ -185,7 +185,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
public static void SaveGotoPoint(Client player, string description)
public static void SaveGotoPoint(Player player, string description)
{
using (var saveData = new DatabaseContext())
{
@@ -207,7 +207,7 @@ namespace ReallifeGamemode.Server.Managers
using (var saveAll = new DatabaseContext())
{
//Alle Spieler
foreach (Client player in NAPI.Pools.GetAllPlayers())
foreach (Player player in NAPI.Pools.GetAllPlayers())
{
Vector3 pos = player.Position;
User user = player.GetUser(saveAll);

6
ReallifeGamemode.Server/Managers/TuningManager.cs
View File

@@ -79,7 +79,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("startPlayerTuning")]
public void StartPlayerTuning(Client player)
public void StartPlayerTuning(Player player)
{
if (!player.IsInVehicle) return;
@@ -87,14 +87,14 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("repairVehicle")]
public void RepairVehicle(Client player)
public void RepairVehicle(Player player)
{
if (!player.IsInVehicle) return;
player.Vehicle.Repair();
}
[RemoteEvent("setVehicleMod")]
public void SetVehicleMod(Client player, int slot, int index)
public void SetVehicleMod(Player player, int slot, int index)
{
Vehicle pV = player.Vehicle;
if (index == 0) index--;

5
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -747,7 +747,7 @@ namespace ReallifeGamemode.Server.Managers
double distanceDriven;
try
{
distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D;
distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData<dynamic>("drivenDistance") : 0D;
}
catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException)
{
@@ -770,13 +770,14 @@ namespace ReallifeGamemode.Server.Managers
foreach (var key in lastPositions.Keys.ToList())
{
Vehicle v = key.Entity<Vehicle>();
if (v == null) continue;
if (!v.HasSharedData("drivenDistance")) continue;
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext);
if (sVeh == null) continue;
sVeh.DistanceDriven = (float)v.GetSharedData("drivenDistance");
sVeh.DistanceDriven = (float)v.GetSharedData<dynamic>("drivenDistance");
}
dbContext.SaveChanges();