aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fick die merge conflikte

Browse Source
This commit is contained in:
Fabian
2021-04-22 16:44:32 +02:00
parent 4dc7ecd824
commit dab527aa5e
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Server/Events/PlayerEvent.cs
View File

@@ -9,13 +9,10 @@ namespace ReallifeGamemode.Server.Events
{ {
internal class PlayerEvent : Script internal class PlayerEvent : Script
{ {
<<<<<<< HEAD
=======
[ServerEvent(Event.PlayerDamage)] [ServerEvent(Event.PlayerDamage)]
public void OnPlayerDamage(Player player, float healthLoss, float armorLoss){ public void OnPlayerDamage(Player player, float healthLoss, float armorLoss){
} }
>>>>>>> 294e2537... NODMZONE ZUM TESTEN
[RemoteEvent("CLIENT:SET_InFrontOfPos")] [RemoteEvent("CLIENT:SET_InFrontOfPos")]
public void SetFrontOfPos(Player player, Vector3 pos) public void SetFrontOfPos(Player player, Vector3 pos)
{ {