Merge conflict

2018-09-23 12:17:57 +02:00
parent 1d500a0169 7e843cca60
commit e455c9efef
4 changed files with 144 additions and 22 deletions
--- a/Server/Events/Login.cs
+++ b/Server/Events/Login.cs
@@ -39,9 +39,11 @@ namespace reallife_gamemode.Server.Events
                    }
                    else 
                    {
-                        player.TriggerEvent("loginSuccess");
+                        player.TriggerEvent("loginSuccess");                       
                        NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING);
+
                        player.SetData("isLoggedIn", true);
+                        player.TriggerEvent("draw");
                    }
                }
            }