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

Added /invite, removed some unneccessary debug lines

Browse Source
This commit is contained in:
hydrant
2018-10-15 23:25:53 +02:00
parent 0101503f17
commit 49085d8a09
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)
{
@@ -225,7 +226,7 @@ namespace reallife_gamemode.Server.Commands
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -279,7 +280,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -308,7 +309,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -329,7 +330,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -350,7 +351,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -392,7 +393,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -417,7 +418,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -439,6 +440,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.");
}
@@ -457,6 +459,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.");
}
@@ -508,6 +511,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.");
}
@@ -543,7 +547,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -558,7 +562,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
User u = target.GetUser(dbContext);
Entities.User u = target.GetUser(dbContext);
if (faction != 0)
{
@@ -594,7 +598,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -609,7 +613,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.
@@ -635,7 +639,7 @@ namespace reallife_gamemode.Server.Commands
Client target = ClientService.GetClientByName(user);
if(target == null)
if(target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(admin);
return;
@@ -728,7 +732,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
User user;
Entities.User user;
using (var dbContext = new DatabaseContext())
{
@@ -809,12 +813,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)
@@ -863,17 +865,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)
{
@@ -945,7 +939,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -964,7 +958,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -983,7 +977,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -1127,7 +1121,7 @@ namespace reallife_gamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByName(name);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
@@ -1163,7 +1157,7 @@ namespace reallife_gamemode.Server.Commands
}
Client target = ClientService.GetClientByName(targetname);
if (target == null)
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;