diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 4c64d1e4..6894f7dc 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -58,21 +58,21 @@ namespace ReallifeGamemode.Server.Events var userItems = loginUser.UserItems.ToList().FindAll(u => u.UserId == user.Id); player.SetData("items", userItems); - //if (user.CharacterId == null) - //{ - // var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension"); - // currentPlayerCreatorDimension++; - // NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); - // player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); - // player.Position = new Vector3(402.8664, -996.4108, -99.00027); - // player.TriggerEvent("toggleCreator"); - //} - //else - //{ - CharacterCreator.ApplyCharacter(player); - UpdateCharacterCloth.LoadCharacterDefaults(player); - NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0); - //} + if (user.CharacterId == null) + { + var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension"); + currentPlayerCreatorDimension++; + NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); + player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); + player.Position = new Vector3(402.8664, -996.4108, -99.00027); + player.TriggerEvent("toggleCreator"); + } + else + { + CharacterCreator.ApplyCharacter(player); + UpdateCharacterCloth.LoadCharacterDefaults(player); + NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0); + } player.TriggerEvent("draw", player.Name, player.Handle.Value); if (user.Dead == true) diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs index 1665df5d..cf9f75a2 100644 --- a/ReallifeGamemode.Server/Events/Register.cs +++ b/ReallifeGamemode.Server/Events/Register.cs @@ -45,11 +45,11 @@ namespace ReallifeGamemode.Server.Events player.SetData("isLoggedIn", true); player.SetData("isDead", false); - //var currentPlayerCreatorDimension = (uint) NAPI.Data.GetWorldData("playerCreatorDimension"); - //currentPlayerCreatorDimension++; - //NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); - //player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); - //player.TriggerEvent("toggleCreator"); + var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension"); + currentPlayerCreatorDimension++; + NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); + player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); + player.TriggerEvent("toggleCreator"); player.Position = new Vector3(user.PositionX, user.PositionY, user.PositionZ);