Resolve merge conflict

Client/Save/save.js

@@ -21,8 +21,3 @@ function saveData() {
 function cancelData() {
     mp.trigger("cancelData");   
 }
-
-function getType() {
-    mp.gui.chat.push("getType");
-    return typ;
-}

Client/index.js

@@ -7,13 +7,10 @@
 
 require('./Login/main.js');
 require('./Save/main.js');
-require('./Save/save.js');
 require('./Gui/deathscreen.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');
 

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.");

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);