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

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);