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

Merge develop into feature/inventory-system

Browse Source
This commit is contained in:
VegaZ
2018-11-26 17:53:25 +01:00
parent e06a2a3f34 5a8da01326
commit fa8f77f80a
66 changed files with 4533 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1998
Server/Commands/Admin.cs
View File

File diff suppressed because it is too large Load Diff

28
Server/Commands/Faction.cs
View File

@@ -78,7 +78,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
Client target = ClientService.GetClientByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -109,7 +109,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
Client target = ClientService.GetClientByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -149,7 +149,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
Client target = ClientService.GetClientByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -239,27 +239,7 @@ namespace reallife_gamemode.Server.Commands
[Command("duty", "~m~Benutzung: ~s~/duty")]
public void CmdFactionDuty(Client player)
{
if (player.GetUser()?.FactionId == null)
{
ChatService.NotAuthorized(player);
return;
}
if(player.GetData("duty") != true)
{
player.SetData("duty", true);
player.SendNotification("Du bist nun ~g~im Dienst.");
if(player.GetUser().FactionId == 2)
{
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", true);
}
}
else
{
player.SetData("duty", false);
player.SendNotification("Du bist nun ~r~außer Dienst.");
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
}
}
#endregion
}

9
Server/Commands/User.cs
View File

@@ -27,9 +27,18 @@ namespace reallife_gamemode.Server.Commands
return;
}
player.ResetData("accept_data");
using(var dbContext = new DatabaseContext())
{
Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_invite"));
if(leader == null)
{
player.SendChatMessage("~r~[FEHLER]~s~ Die Einladung ist abgelaufen.");
return;
}
Entities.User u = leader.GetUser(dbContext);
Entities.User own = player.GetUser(dbContext);