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

Resolve merge conflict

Browse Source
This commit is contained in:
VegaZ
2018-10-21 21:35:34 +02:00
parent 3c947a9288 604229210e
commit 8ce482db9d
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Client/Save/save.js
View File

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

5
Client/index.js
View File

@@ -7,13 +7,10 @@
require('./Login/main.js'); require('./Login/main.js');
require('./Save/main.js'); require('./Save/main.js');
require('./Save/save.js');
require('./Gui/deathscreen.js'); require('./Gui/deathscreen.js');
require('./Gui/infobox.js'); require('./Gui/infobox.js');
require('./Gui/playerlist.js'); require('./Gui/playerlist.js');
require('./Login/main.js');
require('./Player/keys.js'); require('./Player/keys.js');
require('./Save/main.js'); require('./Player/waypoint.js');
require('./FactionManagement/main.js'); require('./FactionManagement/main.js');

2
Server/Commands/Admin.cs
View File

@@ -1280,7 +1280,7 @@ namespace reallife_gamemode.Server.Commands
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
amount = +target.GetUser().GetUserBankAccount(dbContext).Balance; target.GetUser().GetUserBankAccount(dbContext).Balance += amount;
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.");

18
Server/Events/Register.cs
View File

@@ -17,12 +17,10 @@ namespace reallife_gamemode.Server.Events
[RemoteEvent("OnPlayerRegister")] [RemoteEvent("OnPlayerRegister")]
public void OnPlayerRegister(Client player, string password) 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) if (checkedUser == null)
{
using (var registerUser = new Model.DatabaseContext())
{ {
var user = new Entities.User var user = new Entities.User
{ {
@@ -30,17 +28,19 @@ namespace reallife_gamemode.Server.Events
SocialClubName = player.SocialClubName, SocialClubName = player.SocialClubName,
Password = NAPI.Util.GetHashSha256(password) Password = NAPI.Util.GetHashSha256(password)
}; };
registerUser.Users.Add(user);
registerUser.SaveChanges(); dbContext.Users.Add(user);
dbContext.SaveChanges();
var userBankAccount = new Entities.UserBankAccount var userBankAccount = new Entities.UserBankAccount
{ {
UserId = user.Id, UserId = user.Id,
Balance = 5000, Balance = 5000,
Active = true Active = true
}; };
registerUser.UserBankAccounts.Add(userBankAccount);
registerUser.SaveChanges(); dbContext.UserBankAccounts.Add(userBankAccount);
} dbContext.SaveChanges();
player.TriggerEvent("registerSuccess"); player.TriggerEvent("registerSuccess");
NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING); NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING);
player.SetData("isLoggedIn", true); player.SetData("isLoggedIn", true);