From 39bda77a9aa777acbd569a22034dffaa9cbf4c72 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 21 Oct 2018 12:20:53 +0200 Subject: [PATCH 1/4] Fixed /givemoney --- Server/Commands/Admin.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 080dc154..dcd78730 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -1280,7 +1280,7 @@ namespace reallife_gamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - amount = +target.GetUser().GetUserBankAccount(dbContext).Balance; + target.GetUser().GetUserBankAccount(dbContext).Balance += amount; dbContext.SaveChanges(); } player.SendChatMessage("~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ gegeben."); From e1e0cfdc45b5c8c002a03b4a9c396cef0a3c2754 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 21 Oct 2018 12:49:06 +0200 Subject: [PATCH 2/4] Removed unnecessary lines in index.js --- Client/Save/save.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Client/Save/save.js b/Client/Save/save.js index 33a1ed72..0d57b9e3 100644 --- a/Client/Save/save.js +++ b/Client/Save/save.js @@ -20,9 +20,4 @@ function saveData() { function cancelData() { mp.trigger("cancelData"); -} - -function getType() { - mp.gui.chat.push("getType"); - return typ; } \ No newline at end of file From 37a5d8861cd086ca64276caa52afd3030cb7dbd1 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 21 Oct 2018 12:49:42 +0200 Subject: [PATCH 3/4] Edited index.js --- Client/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/index.js b/Client/index.js index 75951af2..a6204744 100644 --- a/Client/index.js +++ b/Client/index.js @@ -6,14 +6,14 @@ require('./Login/main.js'); + require('./Save/main.js'); -require('./Save/save.js'); require('./Gui/infobox.js'); require('./Gui/playerlist.js'); -require('./Login/main.js'); + require('./Player/keys.js'); -require('./Save/main.js'); +require('./Player/waypoint.js'); require('./FactionManagement/main.js'); From 7e662117281739d0ad7a7971a4aea7ce70f0ea0b Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 21 Oct 2018 13:03:56 +0200 Subject: [PATCH 4/4] Removed unnecessary databasecontext on register --- Server/Events/Register.cs | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Server/Events/Register.cs b/Server/Events/Register.cs index 963738cd..742f77a0 100644 --- a/Server/Events/Register.cs +++ b/Server/Events/Register.cs @@ -17,30 +17,30 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("OnPlayerRegister")] public void OnPlayerRegister(Client player, string password) { - using (var checkUser = new Model.DatabaseContext()) + using (var dbContext = new Model.DatabaseContext()) { - var checkedUser = checkUser.Users.SingleOrDefault(b => b.Name == player.Name); + var checkedUser = dbContext.Users.SingleOrDefault(b => b.Name == player.Name); if (checkedUser == null) { - using (var registerUser = new Model.DatabaseContext()) + var user = new Entities.User { - var user = new Entities.User - { - Name = player.Name, - SocialClubName = player.SocialClubName, - Password = NAPI.Util.GetHashSha256(password) - }; - registerUser.Users.Add(user); - registerUser.SaveChanges(); - var userBankAccount = new Entities.UserBankAccount - { - UserId = user.Id, - Balance = 5000, - Active = true - }; - registerUser.UserBankAccounts.Add(userBankAccount); - registerUser.SaveChanges(); - } + Name = player.Name, + SocialClubName = player.SocialClubName, + Password = NAPI.Util.GetHashSha256(password) + }; + + dbContext.Users.Add(user); + dbContext.SaveChanges(); + var userBankAccount = new Entities.UserBankAccount + { + UserId = user.Id, + Balance = 5000, + Active = true + }; + + dbContext.UserBankAccounts.Add(userBankAccount); + dbContext.SaveChanges(); + player.TriggerEvent("registerSuccess"); NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING); player.SetData("isLoggedIn", true);