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

merge conflict

Browse Source
This commit is contained in:
Fabian
2021-04-22 16:39:18 +02:00
parent 3930e005cc
commit 4dc7ecd824
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReallifeGamemode.Client/util/weapondamage.ts
View File

@@ -7,6 +7,11 @@
player.setSuffersCriticalHits(false); player.setSuffersCriticalHits(false);
}); });
mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => {
mp.events.call('checkPosition', targetEntity);
return true;
});
mp.events.add("render", () => { mp.events.add("render", () => {
if (blockInput) { if (blockInput) {
mp.game.controls.disableControlAction(32, 142, true); mp.game.controls.disableControlAction(32, 142, true);

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

@@ -9,6 +9,13 @@ namespace ReallifeGamemode.Server.Events
{ {
internal class PlayerEvent : Script 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")] [RemoteEvent("CLIENT:SET_InFrontOfPos")]
public void SetFrontOfPos(Player player, Vector3 pos) public void SetFrontOfPos(Player player, Vector3 pos)
{ {