Fix merge conflicts

2018-10-22 20:22:45 +02:00
parent 00975dda33 4766d25a17
commit 81e18eb765
11 changed files with 85 additions and 4 deletions
--- a/Server/Events/Login.cs
+++ b/Server/Events/Login.cs
@@ -69,7 +69,19 @@ namespace reallife_gamemode.Server.Events

                        var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id);
                        userBankAccount.Balance = userBankAccount.Balance;
-                        player.TriggerEvent("draw", player.Name, player.Handle.Value);                       
+                        player.TriggerEvent("draw", player.Name, player.Handle.Value);
+
+                        if (user.Dead == true)
+                        {
+                            //player.TriggerEvent("startDeathTimer");
+                            //player.SetData("isDead", true);
+                            //TODO: Deathlog entfernen 
+                            player.Health = 0;
+                        }
+                        else
+                        {
+                            player.SetData("isDead", false);
+                        }
                    }
                }
            }