YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-12 13:26:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

added combat events

Browse Source
This commit is contained in:
YouHaveTrouble
2021-03-12 02:05:29 +01:00
parent f31536395a
commit 477eb7f5de
7 changed files with 156 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/eu/endermite/togglepvp/util/CombatTimer.java
+12 -4
View File
@@ -1,6 +1,10 @@
package eu.endermite.togglepvp.util;
import eu.endermite.togglepvp.TogglePvp;
import eu.endermite.togglepvp.api.event.PlayerEnterCombatEvent;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import java.time.Instant;
import java.util.UUID;
@@ -11,9 +15,15 @@ public class CombatTimer {
long now = Instant.now().getEpochSecond();
long combattime = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
if (combattime < now) {
Player player = Bukkit.getPlayer(uuid);
PlayerEnterCombatEvent playerEnterCombatEvent = new PlayerEnterCombatEvent(player);
Bukkit.getPluginManager().callEvent(playerEnterCombatEvent);
if (playerEnterCombatEvent.isCancelled())
return;
TogglePvp.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat());
}
TogglePvp.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
} catch (Exception ignored) {}
}
@@ -24,9 +34,7 @@ public class CombatTimer {
public static boolean isInCombat(UUID uuid) {
try {
long combattimer = TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid).getCombattime();
long now = Instant.now().getEpochSecond();
return combattimer > now;
return TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid).isInCombat();
} catch (Exception e) {
return false;
}