Optimized imports. Changed ServerTickEventHandler to PlayerTickEventHandler and made grace periods are now updated per player.

This commit is contained in:
micle
2021-06-03 20:49:56 +01:00
parent 26153775c3
commit 47b27d67c8
5 changed files with 22 additions and 25 deletions

View File

@ -42,17 +42,13 @@ public class ProtectedPlayers {
player.sendMessage(new StringTextComponent("Grace Period over!"), player_uuid); player.sendMessage(new StringTextComponent("Grace Period over!"), player_uuid);
} }
public void updateGracePeriods() { public void updateGracePeriod(UUID player_uuid) {
for (ProtectedPlayer protected_player : protected_players) { ProtectedPlayer protected_player = getPlayer(player_uuid);
if (protected_player.isLoading()) { continue; } int grace_period = protected_player.getGracePeriod()-1;
protected_player.setGracePeriod(grace_period);
int grace_period = protected_player.getGracePeriod()-1; if (grace_period <= 0) {
protected_player.setGracePeriod(grace_period); removePlayer(player_uuid);
if (grace_period <= 0) { System.out.println(protected_player.getPlayerUUID() + " is no longer being protected!");
removePlayer(protected_player.getPlayerUUID());
System.out.println(protected_player.getPlayerUUID() + " is no longer being protected!");
break;
}
} }
} }
} }

View File

@ -7,7 +7,6 @@ import net.minecraft.client.multiplayer.ServerData;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnKeyPressEventHandler { public class OnKeyPressEventHandler {

View File

@ -0,0 +1,14 @@
package com.micle.loginprotection.events;
import com.micle.loginprotection.LoginProtection;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnPlayerTickEventHandler {
@SubscribeEvent
public void PlayerTickEvent(TickEvent.PlayerTickEvent event) {
if (LoginProtection.protected_players.getPlayer(event.player.getUUID()) == null) { return; }
LoginProtection.protected_players.updateGracePeriod(event.player.getUUID());
}
}

View File

@ -1,12 +0,0 @@
package com.micle.loginprotection.events;
import com.micle.loginprotection.LoginProtection;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnServerTickEventHandler {
@SubscribeEvent
public void ServerTickEvent(TickEvent.ServerTickEvent event) {
LoginProtection.protected_players.updateGracePeriods();
}
}

View File

@ -13,7 +13,7 @@ public class Registration {
MinecraftForge.EVENT_BUS.register(new OnPlayerJoinEventHandler()); MinecraftForge.EVENT_BUS.register(new OnPlayerJoinEventHandler());
MinecraftForge.EVENT_BUS.register(new OnPlayerDamageEventHandler()); MinecraftForge.EVENT_BUS.register(new OnPlayerDamageEventHandler());
MinecraftForge.EVENT_BUS.register(new OnServerTickEventHandler()); MinecraftForge.EVENT_BUS.register(new OnPlayerTickEventHandler());
MinecraftForge.EVENT_BUS.register(new OnKeyPressEventHandler()); MinecraftForge.EVENT_BUS.register(new OnKeyPressEventHandler());
MinecraftForge.EVENT_BUS.register(new OnPlayerLeaveEventHandler()); MinecraftForge.EVENT_BUS.register(new OnPlayerLeaveEventHandler());