merge conflict

2021-04-22 16:39:18 +02:00
parent 3930e005cc
commit 4dc7ecd824
2 changed files with 12 additions and 0 deletions
--- a/ReallifeGamemode.Server/Events/PlayerEvent.cs
+++ b/ReallifeGamemode.Server/Events/PlayerEvent.cs
@@ -9,6 +9,13 @@ namespace ReallifeGamemode.Server.Events
 {
  internal class PlayerEvent : Script
  {
+<<<<<<< HEAD
+=======
+    [ServerEvent(Event.PlayerDamage)]
+    public void OnPlayerDamage(Player player, float healthLoss, float armorLoss){
+    }
+
+>>>>>>> 294e2537... NODMZONE ZUM TESTEN
    [RemoteEvent("CLIENT:SET_InFrontOfPos")]
    public void SetFrontOfPos(Player player, Vector3 pos)
    {