YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-11 21:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Announce first then kill & adjust config

Browse Source
This commit is contained in:
ElFrod0
2025-05-14 02:01:03 +02:00
parent 667e441460
commit b3d9ae720f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java
+5 -4
View File
@@ -16,7 +16,7 @@ public class ConfigCache {
bucket_stopper_enabled, bucket_stopper_enabled,
fire_stopper_enabled, fire_stopper_enabled,
block_stopper_enabled, block_stopper_enabled,
punish_for_combat_logout, punish_for_combat_logout_kill,
punish_for_combat_logout_announce, punish_for_combat_logout_announce,
block_teleports_in_combat, block_teleports_in_combat,
allow_fishing_rod_pull; allow_fishing_rod_pull;
@@ -54,15 +54,16 @@ public class ConfigCache {
25, 25,
List.of("How long in seconds should combat last since the last hit") List.of("How long in seconds should combat last since the last hit")
); );
this.punish_for_combat_logout = getBoolean(
"settings.punish_for_combat_logout.enabled", this.punish_for_combat_logout_kill = getBoolean(
"settings.punish_for_combat_logout.kill",
true, true,
List.of("Should players be killed if they log out during combat?") List.of("Should players be killed if they log out during combat?")
); );
this.punish_for_combat_logout_announce = getBoolean( this.punish_for_combat_logout_announce = getBoolean(
"settings.punish_for_combat_logout.announce", "settings.punish_for_combat_logout.announce",
true, true,
List.of("Should killing of a player that logged out of combat be announced?") List.of("Should we announce that player logged out of combat?")
); );
List<String> commandsBlockedInCombat = getList( List<String> commandsBlockedInCombat = getList(
src/main/java/me/youhavetrouble/preventstabby/data/PlayerListener.java
+4 -3
View File
@@ -44,13 +44,14 @@ public class PlayerListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerLeave(PlayerQuitEvent event) { public void onPlayerLeave(PlayerQuitEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout) return; if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_announce) {
PluginMessages.broadcastMessage(player, PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_message);
}
if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_kill) return;
PlayerData playerData = PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()); PlayerData playerData = PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
if (playerData == null) return; if (playerData == null) return;
if (!playerData.isInCombat()) return; if (!playerData.isInCombat()) return;
player.setHealth(0); player.setHealth(0);
if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_announce) return;
PluginMessages.broadcastMessage(player, PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_message);
} }
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)