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

Added /invite Command, removed some unnecessary debug lines

Browse Source
This commit is contained in:
hydrant
2018-10-15 23:26:56 +02:00
parent 460f87a671 49085d8a09
commit 5ec7dc0bc5
4 changed files with 107 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Server/Commands/Admin.cs
View File

@@ -166,7 +166,7 @@ namespace reallife_gamemode.Server.Commands
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -187,6 +187,7 @@ namespace reallife_gamemode.Server.Commands
player.SendChatMessage("Position: X Y Z: " + player.Position);
}
[Command("goto", "~m~Benutzung: ~s~/goto [Ort]")]
public void CmdAdminGotoPoint(Client player, string location)
{
@@ -243,7 +244,7 @@ namespace reallife_gamemode.Server.Commands
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -297,7 +298,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -326,7 +327,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -347,7 +348,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -368,7 +369,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -410,7 +411,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -435,7 +436,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -457,6 +458,7 @@ namespace reallife_gamemode.Server.Commands
foreach (var managedClient in peopleInRange)
{
if (!managedClient.IsLoggedIn()) return;
managedClient.Health = hp;
managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt.");
}
@@ -475,6 +477,7 @@ namespace reallife_gamemode.Server.Commands
foreach (var managedClient in peopleInRange)
{
if (!managedClient.IsLoggedIn()) return;
managedClient.Armor = Armor;
managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " die Rüstung auf " + Armor + " gesetzt.");
}
@@ -526,6 +529,7 @@ namespace reallife_gamemode.Server.Commands
foreach (var managedClient in peopleInRange)
{
if (!managedClient.IsLoggedIn()) return;
managedClient.GiveWeapon(wHash, munition);
managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " eine/n " + weapon + " mit " + munition + " Munition vergeben.");
}
@@ -561,7 +565,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -576,7 +580,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
User u = target.GetUser(dbContext);
Entities.User u = target.GetUser(dbContext);
if (faction != 0)
{
@@ -612,7 +616,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -627,7 +631,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
User u = target.GetUser(dbContext);
Entities.User u = target.GetUser(dbContext);
u.FactionId = f.Id;
u.FactionRankId = dbContext.FactionRanks.
@@ -653,7 +657,7 @@ namespace reallife_gamemode.Server.Commands
Client target = ClientService.GetClientByName(user);
if(target == null)
if(target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(admin);
return;
@@ -746,7 +750,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
User user;
Entities.User user;
using (var dbContext = new DatabaseContext())
{
@@ -827,12 +831,10 @@ namespace reallife_gamemode.Server.Commands
};
string json = JsonConvert.SerializeObject(helper, Formatting.None);
Console.WriteLine(json);
player.TriggerEvent("manageFactionRanks", json);
}
}
//TEST COMMAND
[Command("own")]
public void CmdAdminOwn(Client player)
@@ -881,17 +883,9 @@ namespace reallife_gamemode.Server.Commands
return;
}
List<Client> playerlist = NAPI.Pools.GetAllPlayers();
foreach (Client currentPlayer in playerlist)
{
if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? false)
{
NAPI.Chat.SendChatMessageToPlayer(currentPlayer, "~r~Admin " + NAPI.Player.GetPlayerName(player) + "~w~: " + message);
}
}
ChatService.BroadcastAdmin("~r~Admin " + player.Name + "~w~: " + message, AdminLevel.ADMIN);
}
[Command("team", "~m~Benutzung: ~s~/team")]
public void CmdAdminTeam(Client player)
{
@@ -963,7 +957,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -982,7 +976,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -1001,7 +995,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -1145,7 +1139,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -1181,7 +1175,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;