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

test

Browse Source
This commit is contained in:
xSprite
2018-10-21 05:57:13 +02:00
parent 780e602a76
commit 14e5aef46e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Server/Commands/Admin.cs
View File

@@ -581,7 +581,6 @@ namespace reallife_gamemode.Server.Commands
if (f == null && faction != 0) if (f == null && faction != 0)
{ {
player.SendChatMessage("~r~[FEHLER]~s~ Diese Fraktion existiert nicht (Liste: ~m~/factionlist)."); player.SendChatMessage("~r~[FEHLER]~s~ Diese Fraktion existiert nicht (Liste: ~m~/factionlist).");
CmdAdminFactionlist(player);
return; return;
} }
@@ -1260,8 +1259,8 @@ namespace reallife_gamemode.Server.Commands
target.GetUser().GetUserBankAccount(dbContext).Balance = amount; target.GetUser().GetUserBankAccount(dbContext).Balance = amount;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
player.SendChatMessage("~b~[ADMIN]~s~Du hast das Geld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt."); player.SendChatMessage("~b~[ADMIN]~s~ Du hast das Geld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt.");
target.SendChatMessage("~b~[ADMIN]~s~Dein Geld wurde von Admin " + player.Name + " auf ~g~$" + amount + "~s~ gesetzt."); target.SendChatMessage("~b~[ADMIN]~s~ Dein Geld wurde von Admin " + player.Name + " auf ~g~$" + amount + "~s~ gesetzt.");
} }
[Command("givemoney")] [Command("givemoney")]
@@ -1281,11 +1280,11 @@ namespace reallife_gamemode.Server.Commands
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
target.GetUser().GetUserBankAccount(dbContext).Balance =+ amount; amount = +target.GetUser().GetUserBankAccount(dbContext).Balance;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
player.SendChatMessage("~b~[ADMIN]~s~Du hast " + target.Name + " ~g~$" + amount + "~s~ gegeben."); player.SendChatMessage("~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ gegeben.");
target.SendChatMessage("~b~[ADMIN]~s~Admin" + player.Name + " hat dir ~g~$" + amount + "~s~ gegeben."); target.SendChatMessage("~b~[ADMIN]~s~ Admin " + player.Name + " hat dir ~g~$" + amount + "~s~ gegeben.");
} }
//TODO //TODO

9
Server/Events/Death.cs
View File

@@ -25,9 +25,6 @@ namespace reallife_gamemode.Server.Events
//TODO: Zum Full Release entfernen //TODO: Zum Full Release entfernen
NAPI.Chat.SendChatMessageToPlayer(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString()); NAPI.Chat.SendChatMessageToPlayer(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString());
string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet.("+NAPI.Player.GetPlayerCurrentWeapon(killer)+")";
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
int? killerId; int? killerId;
float killerPosX; float killerPosX;
float killerPosY; float killerPosY;
@@ -41,12 +38,16 @@ namespace reallife_gamemode.Server.Events
killerPosY = -1; killerPosY = -1;
killerPosZ = -1; killerPosZ = -1;
killerHeading = -1; killerHeading = -1;
} else { }
else
{
killerId = killer.GetUser().Id; killerId = killer.GetUser().Id;
killerPosX = killer.Position.X; killerPosX = killer.Position.X;
killerPosY = killer.Position.Y; killerPosY = killer.Position.Y;
killerPosZ = killer.Position.Z; killerPosZ = killer.Position.Z;
killerHeading = killer.Heading; killerHeading = killer.Heading;
string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + NAPI.Player.GetPlayerCurrentWeapon(killer) + ")";
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
} }
using (var userDeath = new DatabaseContext()) using (var userDeath = new DatabaseContext())