minecraft-mods/login_protection
Private
Public Access
1
0
Fork 0
Code Issues 1 Projects Releases 16 Wiki Activity

Fixed damage event not cancelling when it should.

Browse Source
This commit is contained in:
Micle
2022-05-24 00:00:46 +01:00
parent acc48922b1
commit 0f1950b5cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java
View File

@ -11,8 +11,8 @@ public class OnPlayerDamageEventHandler {
public void LivingDamageEvent(LivingDamageEvent event) { public void LivingDamageEvent(LivingDamageEvent event) {
if (!(event.getEntity() instanceof Player player)) { return; } if (!(event.getEntity() instanceof Player player)) { return; }
ProtectedPlayer protectedPlayer = ProtectedPlayerManager.getPlayer(player.getUUID()); ProtectedPlayer protectedPlayer = ProtectedPlayerManager.getPlayer(player.getUUID());
if (protectedPlayer == null || protectedPlayer.getState().equals(ProtectedPlayer.State.JOINING) || if (protectedPlayer == null || protectedPlayer.getState().equals(ProtectedPlayer.State.ACTIVE) &&
protectedPlayer.getState().equals(ProtectedPlayer.State.AFK) || protectedPlayer.getGracePeriodTimeRemaining() == 0) { protectedPlayer.getGracePeriodTimeRemaining() == 0) {
return; return;
} }
event.setCanceled(true); event.setCanceled(true);