Skip to content

Commit 034dd3f

Browse files
committed
100% fixes all the problems
1 parent 24cc0d4 commit 034dd3f

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

CuffUtilsNwAPI/EventHandler.cs

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,47 @@
22
using PluginAPI.Core;
33
using PluginAPI.Core.Attributes;
44
using PluginAPI.Enums;
5+
using PluginAPI.Events;
56

67
namespace CuffUtilsNwAPI
78
{
89
public class EventHandler
910
{
1011
private readonly Config _config = CuffUtils.Singleton.Config;
1112

12-
[PluginEvent(ServerEventType.PlayerHandcuff)]
13-
public void PlayerCuffingEvent(Player player, Player target, bool state)
13+
[PluginEvent]
14+
public void PlayerCuffingEvent(PlayerHandcuffEvent ev)
1415
{
1516
if (_config.EnableCuffRemoveOnDistance)
1617
{
17-
DistanceComponent distanceComponent = target.GameObject.AddComponent<DistanceComponent>();
18-
distanceComponent.Target = target;
18+
DistanceComponent distanceComponent = ev.Target.GameObject.AddComponent<DistanceComponent>();
19+
distanceComponent.Target = ev.Target;
1920
}
2021
}
2122

22-
[PluginEvent(ServerEventType.PlayerRemoveHandcuffs)]
23-
public void PlayerUncuffingEvent(Player player, Player target, bool state)
23+
[PluginEvent]
24+
public void PlayerUncuffingEvent(PlayerRemoveHandcuffsEvent ev)
2425
{
2526
}
2627

27-
[PluginEvent(ServerEventType.PlayerDamage)]
28-
public bool PlayerDamagingEvent(Player player, Player attacker, DamageHandlerBase damageHandler)
28+
[PluginEvent]
29+
public bool PlayerDamagingEvent(PlayerDamageEvent ev)
2930
{
30-
if (player == null)
31-
return false;
3231

33-
if (attacker == null)
34-
return true;
35-
36-
if (player.IsDisarmed)
32+
if (ev.Target.IsDisarmed)
3733
{
38-
if (_config.WhitelistCuffDamageRole.Contains(attacker.Role))
34+
if (_config.WhitelistCuffDamageRole.Contains(ev.Player.Role))
3935
{
40-
Log.Debug($"Attacker role is whitelisted {attacker.Role}");
36+
Log.Debug($"Attacker role is whitelisted {ev.Player.Role}");
4137
return true;
42-
} else if (_config.BlacklistDetainDamageRole.Contains(attacker.Role))
38+
} else if (_config.BlacklistDetainDamageRole.Contains(ev.Player.Role))
4339
{
44-
Log.Debug($"Attacker role is blacklisted {attacker.Role}");
40+
Log.Debug($"Attacker role is blacklisted {ev.Player.Role}");
4541
return false;
4642
}
4743

4844
if (_config.DetainPlayerTakeDmg == false)
49-
player.DamageManager.CanReceiveDamageFromPlayers = false;
45+
ev.Target.DamageManager.CanReceiveDamageFromPlayers = false;
5046
}
5147
return true;
5248
}

CuffUtilsNwAPI/Plugin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace CuffUtilsNwAPI
99
public class CuffUtils
1010
{
1111
public const string PluginName = "CuffUtils";
12-
public const string PluginVersion = "1.2.0"; //Maj/Min/Build
12+
public const string PluginVersion = "1.2.1"; //Maj/Min/Build
1313
public const string PluginDesc = "Multi-purpose plugin that creates many features around cuffing events to help moderation/gameplay changes";
1414

1515
public static CuffUtils Singleton;

0 commit comments

Comments
 (0)