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

Try fix for business error

Browse Source
This commit is contained in:
hydrant
2018-11-27 19:12:07 +01:00
parent dc998e27a4
commit d1c5d8e2bd
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Server/Commands/Admin.cs
View File

@@ -145,11 +145,12 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
/* if (target == player) //TODO: wieder reintun, musste testen if (target == player)
{ {
ChatService.ErrorMsg(player); ChatService.ErrorMsg(player);
return; return;
}*/ }
player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " "); player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " ");
string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + ""; string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + "";
NAPI.Chat.SendChatMessageToPlayer(target, Message); NAPI.Chat.SendChatMessageToPlayer(target, Message);
@@ -539,7 +540,7 @@ namespace reallife_gamemode.Server.Commands
if (ban.Applied == ban.UntilDateTime) if (ban.Applied == ban.UntilDateTime)
{ {
user.UnbanPlayer(admin); user.UnbanPlayer();
} }
else else
{ {
@@ -550,7 +551,7 @@ namespace reallife_gamemode.Server.Commands
return; return;
} }
} }
user.UnbanPlayer(admin); user.UnbanPlayer();
} }
string message = "~b~[ADMIN] ~s~Der Spieler ~y~" + user.Name + " ~s~wurde von ~y~" + admin.Name + " ~s~entbannt."; string message = "~b~[ADMIN] ~s~Der Spieler ~y~" + user.Name + " ~s~wurde von ~y~" + admin.Name + " ~s~entbannt.";
@@ -801,7 +802,8 @@ namespace reallife_gamemode.Server.Commands
} }
/* TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto) /* TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto)
* Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat */ * Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat
*/
player.Vehicle.Delete(); player.Vehicle.Delete();
} }

11
Server/Entities/User.cs
View File

@@ -100,14 +100,16 @@ namespace reallife_gamemode.Server.Entities
{ {
NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + this.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]"); NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + this.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]");
banUser = new Ban { UserId = this.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp }; banUser = new Ban { UserId = this.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp };
//TODO user.Kick();
GetClient()?.Kick();
mins--; mins--;
} }
else else
{ {
NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + this.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]"); NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + this.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]");
banUser = new Ban { UserId = this.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 }; banUser = new Ban { UserId = this.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 };
//TODO user.Kick(); GetClient()?.Kick();
} }
banUserContext.Bans.Add(banUser); banUserContext.Bans.Add(banUser);
@@ -119,12 +121,11 @@ namespace reallife_gamemode.Server.Entities
} }
} }
public void UnbanPlayer(Client admin) public void UnbanPlayer()
{ {
using (var unbanUser = new DatabaseContext()) using (var unbanUser = new DatabaseContext())
{ {
User user = admin.GetUser(); var targetUser = unbanUser.Users.FirstOrDefault(u => u.Id == this.Id);
var targetUser = unbanUser.Users.FirstOrDefault(u => u.Id == user.Id);
targetUser.BanId = null; targetUser.BanId = null;
unbanUser.SaveChanges(); unbanUser.SaveChanges();
} }

4
Server/Managers/BusinessManager.cs
View File

@@ -60,7 +60,7 @@ namespace reallife_gamemode.Server.Managers
TransactionResult result = BankManager.TransferMoney(user, playerBusiness, amount, "Überweisung"); TransactionResult result = BankManager.TransferMoney(user, playerBusiness, amount, "Überweisung");
if(result == TransactionResult.NEGATIVE_MONEY_SENT) /*if(result == TransactionResult.NEGATIVE_MONEY_SENT)
{ {
player.SendNotification("~r~Es können nur positive Beträge überwiesen werden"); player.SendNotification("~r~Es können nur positive Beträge überwiesen werden");
return; return;
@@ -70,7 +70,7 @@ namespace reallife_gamemode.Server.Managers
player.SendNotification("~r~Du hast nicht genug Geld"); player.SendNotification("~r~Du hast nicht genug Geld");
return; return;
} }
else if(result == TransactionResult.SUCCESS) else */if(result == TransactionResult.SUCCESS)
{ {
player.TriggerEvent("business_updateMoney", playerBusiness.GetBankAccount().Balance.ToMoneyString()); player.TriggerEvent("business_updateMoney", playerBusiness.GetBankAccount().Balance.ToMoneyString());
player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen"); player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");