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

[#] Finish Inventory System

Browse Source
This commit is contained in:
Lukas Moungos
2019-09-16 19:19:05 +02:00
parent e075ece48a
commit 799d0aabe5
4 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -514,7 +514,7 @@ namespace ReallifeGamemode.Server.Managers
User user = client.GetUser();
string nameOrId = JsonConvert.DeserializeObject<string>(jsonNameOrId);
Client target = ClientService.GetClientByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn() || target == client)
if (target == null || !target.IsLoggedIn() )
{
ChatService.PlayerNotFound(client);
return;
@@ -586,12 +586,12 @@ namespace ReallifeGamemode.Server.Managers
client.SetData("inTrade", true);
sender.SetData("inTrade", true);
ChatService.SendMessage(client, $"~b~ Du hast eine Handelsanfrage von {sender.Name} bekommen.");
client.SetSharedData("tradeOffer", 1);
client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(1));
User user = sender.GetUser();
Timer tradeTimer = new Timer(30000);
TradeTimer[user.Id] = tradeTimer;
tradeTimer.Start();
tradeTimer.Elapsed += (s, e) => { SendBackToSender(sender); client.SetData("inTrade", false); sender.SetData("inTrade", false); client.SetSharedData("tradeOffer", 0); };
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)
@@ -632,7 +632,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("declineTrade")]
public void ServerEvent_declineTrade(Client client)
{
client.SetSharedData("tradeOffer", 0);
client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0));
if (!client.GetData("inTrade"))
{
ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen.");
@@ -670,7 +670,7 @@ namespace ReallifeGamemode.Server.Managers
ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen.");
return;
}
client.SetSharedData("tradeOffer", 0);
client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0));
client.SetData("inTrade", false);
User user = client.GetUser();