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

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)