Resolve merge conflict

This commit is contained in:
VegaZ
2018-09-27 20:33:13 +02:00
6 changed files with 356 additions and 21 deletions

View File

@@ -45,6 +45,7 @@ namespace reallife_gamemode.Server.Events
NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING);
player.SetData("isLoggedIn", true);
player.SetData("spec", true);
player.TriggerEvent("draw");
player.Position = new Vector3(user.PositionX, user.PositionY, user.PositionZ);
}