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

Reimplemented cloting loading on login

Browse Source
This commit is contained in:
hydrant
2018-12-16 20:08:52 +01:00
parent 940e581f2b
commit f3f242fb77
2 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Server/Events/Login.cs
View File

@@ -20,19 +20,19 @@ namespace reallife_gamemode.Server.Events
{ {
[RemoteEvent("OnPlayerLogin")] [RemoteEvent("OnPlayerLogin")]
public void OnPlayerLogin(Client player, string password) public void OnPlayerLogin(Client player, string password)
{ {
using (var loginUser = new Model.DatabaseContext()) using (var loginUser = new Model.DatabaseContext())
{ {
var user = loginUser.Users.SingleOrDefault(b => b.Name == player.Name); var user = loginUser.Users.SingleOrDefault(b => b.Name == player.Name);
if(user == null) if (user == null)
{ {
player.TriggerEvent("loginFail", "Benutzer existiert nicht! Registriere dich zuerst!"); player.TriggerEvent("loginFail", "Benutzer existiert nicht! Registriere dich zuerst!");
} }
else else
{ {
if (user.SocialClubName != player.SocialClubName && user.Password == NAPI.Util.GetHashSha256(password)) if (user.SocialClubName != player.SocialClubName && user.Password == NAPI.Util.GetHashSha256(password))
{ {
player.TriggerEvent("loginDeny", "Dieser Benutzer gehört dir nicht!"); player.TriggerEvent("loginDeny", "Dieser Benutzer gehört dir nicht!");
//TODO ?? Log einbauen für den bösen Bub. //TODO ?? Log einbauen für den bösen Bub.
player.Kick(); player.Kick();
@@ -40,62 +40,62 @@ namespace reallife_gamemode.Server.Events
if (user.Password != NAPI.Util.GetHashSha256(password)) if (user.Password != NAPI.Util.GetHashSha256(password))
{ {
player.TriggerEvent("loginFail", "Passwort inkorrekt!"); player.TriggerEvent("loginFail", "Passwort inkorrekt!");
} }
else else
{ {
player.TriggerEvent("loginSuccess"); player.TriggerEvent("loginSuccess");
player.SetData("isLoggedIn", true); player.SetData("isLoggedIn", true);
player.SetData("spec", true); player.SetData("spec", true);
player.SetData("duty", false); player.SetData("duty", false);
if(user.IsAdmin(AdminLevel.HEADADMIN) == true) if (user.IsAdmin(AdminLevel.HEADADMIN) == true)
{ {
player.SetData("editmode", false); player.SetData("editmode", false);
} }
//var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id); var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id);
//userBankAccount.Balance = userBankAccount.Balance; userBankAccount.Balance = userBankAccount.Balance;
//var userItems = loginUser.UserItems.ToList().FindAll(u => u.UserId == user.Id); var userItems = loginUser.UserItems.ToList().FindAll(u => u.UserId == user.Id);
//player.SetData("items", userItems); player.SetData("items", userItems);
//if (user.CharacterId == null) if (user.CharacterId == null)
//{ {
// var currentPlayerCreatorDimension = (uint) NAPI.Data.GetWorldData("playerCreatorDimension"); var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension");
// currentPlayerCreatorDimension++; currentPlayerCreatorDimension++;
// NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension);
// player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension");
// player.Position = new Vector3(402.8664, -996.4108, -99.00027); player.Position = new Vector3(402.8664, -996.4108, -99.00027);
// player.TriggerEvent("toggleCreator"); player.TriggerEvent("toggleCreator");
//} }
//else else
//{ {
// CharacterCreator.ApplyCharacter(player); CharacterCreator.ApplyCharacter(player);
// UpdateCharacterCloth.LoadCharacterDefaults(player); UpdateCharacterCloth.LoadCharacterDefaults(player);
NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0); NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0);
// player.TriggerEvent("draw", player.Name, player.Handle.Value); player.TriggerEvent("draw", player.Name, player.Handle.Value);
//} }
//if (user.Dead == true) if (user.Dead == true)
//{ {
// if (user.IsAdmin(AdminLevel.ADMIN) == true) if (user.IsAdmin(AdminLevel.ADMIN) == true)
// { {
// player.TriggerEvent("startDeathTimer", true); player.TriggerEvent("startDeathTimer", true);
// player.Health = 0; player.Health = 0;
// } }
// else else
// { {
// player.TriggerEvent("startDeathTimer", false); player.TriggerEvent("startDeathTimer", false);
// player.Health = 0; player.Health = 0;
// } }
// player.SetData("isDead", true); player.SetData("isDead", true);
//} }
//else else
//{ {
// player.SetData("isDead", false); player.SetData("isDead", false);
//} }
} }
} }
} }
} }
} }
} }

9
reallife-gamemode.csproj
View File

@@ -16,9 +16,12 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" /> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(ConfigurationName)' != 'ServerBuild'"> <ItemGroup Condition="'$(ConfigurationName)' != 'ServerBuild'">