Refactor death handling to new class

Author: ChanceSD

pvpmanager-plugin/pom.xml

@@ -22,10 +22,10 @@
 				<configuration>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<transformers>
-						<!-- Avoid overlapping MANIFEST.MF file -->
+						<!-- Exclude MANIFEST.MF to avoid overlapping files warning -->
 						<transformer
 							implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-							<resource>MANIFEST.MF</resource>
+							<resource>META-INF/MANIFEST.MF</resource>
 						</transformer>
 					</transformers>
 				</configuration>

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Help.java

@@ -104,7 +104,7 @@ private String getCommandUsage(final BaseCommand command, final String commandNa
 	 */
 	private String buildAutoHoverText(final BaseCommand command, final String description) {
 		final String usage = getCommandUsage(command, "");
-		final boolean needsParameters = usage.contains("<") || usage.contains("[");
+		final boolean needsParameters = usage.contains("<");
 
 		if (needsParameters) {
 			return buildSyntaxHoverText(description, command);

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/BlockedActionsListener.java

@@ -4,17 +4,23 @@
 import me.chancesd.sdutils.utils.MCVersion;
 import java.util.Arrays;
 
+import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.FireworkMeta;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
@@ -26,9 +32,15 @@
 public class BlockedActionsListener implements Listener {
 
 	private final PlayerManager playerHandler;
+	Material fireworkMaterial;
 
 	public BlockedActionsListener(final PlayerManager ph) {
 		this.playerHandler = ph;
+		if (MCVersion.isAtLeast(MCVersion.V1_13)) {
+			fireworkMaterial = Material.FIREWORK_ROCKET;
+		} else {
+			fireworkMaterial = Material.getMaterial("FIREWORK");
+		}
 	}
 
 	@EventHandler(ignoreCancelled = true)
@@ -62,6 +74,66 @@ public final void onToggleFlight(final PlayerToggleFlightEvent event) {
 		}
 	}
 
+	@EventHandler
+	public final void onFireworkUseWhileGliding(final PlayerInteractEvent event) {
+		final Player player = event.getPlayer();
+		if (MCVersion.isLowerThan(MCVersion.V1_9) || !player.isGliding())
+			return;
+
+		final Action action = event.getAction();
+		if (action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK)
+			return;
+
+		final CombatPlayer pvPlayer = playerHandler.get(player);
+		if (!pvPlayer.isInCombat())
+			return;
+
+		@SuppressWarnings("deprecation")
+		final ItemStack item = player.getInventory().getItemInHand();
+		if (item.getType() != fireworkMaterial)
+			return;
+
+		// Check if fireworks are completely blocked
+		if (Conf.BLOCK_FIREWORKS_IN_COMBAT.asBool()) {
+			event.setCancelled(true);
+			pvPlayer.sendActionBar(Lang.FIREWORK_BLOCKED_IN_COMBAT.msg(), 1000);
+			return;
+		}
+
+		// Check power limit
+		final int powerLimit = Conf.FIREWORK_POWER_LIMIT.asInt();
+		if (powerLimit >= 0 && item.hasItemMeta()) {
+			final FireworkMeta meta = (FireworkMeta) item.getItemMeta();
+			if (meta != null && meta.getPower() > powerLimit) {
+				event.setCancelled(true);
+				pvPlayer.sendActionBar(Lang.FIREWORK_POWER_LIMITED_IN_COMBAT.msg(meta.getPower()), 1000);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) // cancel on low since some plugins check cancels on normal instead of monitor
+	public final void onPlayerBlockInteract(final PlayerInteractEvent e) {
+		final Player player = e.getPlayer();
+		if (!Conf.BLOCK_INTERACT_IN_COMBAT.asBool() || e.getAction() != Action.RIGHT_CLICK_BLOCK && e.getAction() != Action.PHYSICAL
+				|| CombatUtils.isWorldExcluded(player.getWorld().getName()))
+			return;
+
+		final CombatPlayer combatPlayer = playerHandler.get(player);
+		final Block clickedBlock = e.getClickedBlock();
+		if (clickedBlock == null)
+			return;
+		if (combatPlayer.isInCombat()) {
+			final Material blockType = clickedBlock.getType();
+			for (final String material : Conf.BLOCK_INTERACT_ITEM_LIST.asList()) {
+				if (blockType.name().endsWith(material)) {
+					e.setCancelled(true);
+					combatPlayer.sendActionBar(Lang.INTERACT_BLOCKED_IN_COMBAT.msg(), 1000);
+					return;
+				}
+			}
+		}
+	}
+
 	@SuppressWarnings("deprecation")
 	@EventHandler(ignoreCancelled = true)
 	public final void onPlayerPickup(final PlayerPickupItemEvent e) {
@@ -92,16 +164,18 @@ public final void onPlayerTeleport(final PlayerTeleportEvent event) {
 				&& Conf.BLOCK_CHORUSFRUIT.asBool()) {
 			event.setCancelled(true);
 			pvplayer.message(Lang.CHORUS_BLOCKED_IN_COMBAT);
-		} else if (cause.equals(TeleportCause.COMMAND) && Conf.BLOCK_TELEPORT.asBool()) {
-			event.setCancelled(true);
-			pvplayer.message(Lang.TELEPORT_BLOCKED_IN_COMBAT);
-		} else if ((cause.equals(TeleportCause.PLUGIN) || cause.equals(TeleportCause.UNKNOWN))
-				&& Conf.BLOCK_UNSAFE_TELEPORTS.asBool()) { // Some plugins use PLUGIN or UNKNOWN as the cause.
+		} else if (shouldBlockTeleport(cause)) {
 			event.setCancelled(true);
 			pvplayer.message(Lang.TELEPORT_BLOCKED_IN_COMBAT);
 		}
 	}
 
+	private boolean shouldBlockTeleport(final TeleportCause cause) {
+		return cause.equals(TeleportCause.COMMAND) && Conf.BLOCK_TELEPORT.asBool() ||
+		// Some plugins use PLUGIN or UNKNOWN as the cause.
+				(cause.equals(TeleportCause.PLUGIN) || cause.equals(TeleportCause.UNKNOWN)) && Conf.BLOCK_UNSAFE_TELEPORTS.asBool();
+	}
+
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public final void onCommand(final PlayerCommandPreprocessEvent event) {
 		if (Conf.COMBAT_TAG_ENABLED.asBool() && Conf.BLOCK_COMMANDS.asBool() || Conf.NEWBIE_ENABLED.asBool()) {

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/PlayerListener.java

@@ -1,12 +1,9 @@
 package me.chancesd.pvpmanager.listener;
 
 import me.chancesd.sdutils.utils.Log;
-import me.chancesd.sdutils.utils.MCVersion;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import java.util.Set;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -27,14 +24,9 @@
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.FireworkMeta;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 
-import me.chancesd.pvpmanager.integration.Hook;
-import me.chancesd.pvpmanager.integration.type.WorldGuardDependency;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.ProtectionResult;
@@ -49,12 +41,10 @@
 public class PlayerListener implements Listener {
 
 	private final PlayerManager playerHandler;
-	private final WorldGuardDependency wg;
 	private final Cache<UUID, String> msgCooldown = CacheBuilder.newBuilder().weakValues().expireAfterWrite(800, TimeUnit.MILLISECONDS).build();
 
 	public PlayerListener(final PlayerManager ph) {
 		this.playerHandler = ph;
-		this.wg = (WorldGuardDependency) ph.getPlugin().getDependencyManager().getDependency(Hook.WORLDGUARD);
 	}
 
 	@EventHandler(ignoreCancelled = true)
@@ -75,55 +65,6 @@ public final void onPlayerEat(final PlayerItemConsumeEvent event) {
 		}
 	}
 
-	@EventHandler
-	public final void onFireworkUseWhileGliding(final PlayerInteractEvent event) {
-		final Player player = event.getPlayer();
-		if (MCVersion.isLowerThan(MCVersion.V1_9) || !player.isGliding())
-			return;
-
-		final Action action = event.getAction();
-		if (action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK)
-			return;
-
-		final CombatPlayer pvPlayer = playerHandler.get(player);
-		if (!pvPlayer.isInCombat())
-			return;
-
-		@SuppressWarnings("deprecation")
-		final ItemStack item = player.getInventory().getItemInHand();
-		Material fireworkMaterial = null;
-		if (MCVersion.isAtLeast(MCVersion.V1_13)) {
-			fireworkMaterial = Material.FIREWORK_ROCKET;
-		} else {
-			// For versions before 1.13, try to get the legacy material
-			try {
-				fireworkMaterial = Material.getMaterial("FIREWORK");
-			} catch (final Exception e) {
-				return;
-			}
-		}
-
-		if (item.getType() != fireworkMaterial)
-			return;
-
-		// Check if fireworks are completely blocked
-		if (Conf.BLOCK_FIREWORKS_IN_COMBAT.asBool()) {
-			event.setCancelled(true);
-			pvPlayer.sendActionBar(Lang.FIREWORK_BLOCKED_IN_COMBAT.msg(), 1000);
-			return;
-		}
-
-		// Check power limit
-		final int powerLimit = Conf.FIREWORK_POWER_LIMIT.asInt();
-		if (powerLimit >= 0 && item.hasItemMeta()) {
-			final FireworkMeta meta = (FireworkMeta) item.getItemMeta();
-			if (meta != null && meta.getPower() > powerLimit) {
-				event.setCancelled(true);
-				pvPlayer.sendActionBar(Lang.FIREWORK_POWER_LIMITED_IN_COMBAT.msg(meta.getPower()), 1000);
-			}
-		}
-	}
-
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
 	public final void onPlayerKick(final PlayerKickEvent event) {
 		final Player player = event.getPlayer();
@@ -158,58 +99,9 @@ public final void onPlayerLogoutMonitor(final PlayerQuitEvent event) {
 
 	@EventHandler(priority = EventPriority.HIGH)
 	public final void onPlayerDeath(final PlayerDeathEvent event) {
-		final Player player = event.getEntity();
-		if (CombatUtils.isWorldExcluded(player.getWorld().getName()))
-			return;
-
-		final CombatPlayer pvPlayer = playerHandler.get(player);
-		final Player killer = player.getKiller();
-
-		// Player died in combat, process that
-		if (killer != null && !killer.equals(player)) {
-			final CombatPlayer pKiller = playerHandler.get(killer);
-			handlePvPDeath(player, pvPlayer, killer, pKiller, event);
-		}
-
-		if (pvPlayer.isInCombat()) {
-			final Set<CombatPlayer> enemies = pvPlayer.getEnemies();
-			if (Conf.UNTAG_ON_KILL.asBool()) {
-				enemies.forEach(enemy -> enemy.removeEnemy(pvPlayer));
-			}
-			pvPlayer.untag(UntagReason.DEATH);
-		}
-
-		// Let's process player's inventory/exp according to config file
-		if (pvPlayer.hasPvPLogged()) {
-			playerHandler.handleCombatLogDrops(event, player);
+		if (CombatUtils.isWorldExcluded(event.getEntity().getWorld().getName()))
 			return;
-		}
-
-		playerHandler.handlePlayerDrops(event, player, killer);
-	}
-
-	private void handlePvPDeath(final Player player, final CombatPlayer pvPlayer, final Player killer, final CombatPlayer pKiller, final PlayerDeathEvent event) {
-		if (Conf.KILL_ABUSE_ENABLED.asBool() && !pKiller.hasPerm(Permissions.EXEMPT_KILL_ABUSE)) {
-			pKiller.addVictim(player);
-		}
-		if (wg == null || !wg.containsRegionsAt(killer.getLocation(), Conf.KILLS_WG_EXCLUSIONS.asSet())) {
-			if (Conf.MONEY_REWARD.asDouble() > 0) {
-				pKiller.giveReward(pvPlayer);
-			}
-			if (Conf.MONEY_PENALTY.asDouble() > 0) {
-				pvPlayer.applyPenalty();
-			}
-			if (pKiller.canExecuteKillCommand()) {
-				CombatUtils.executeCommands(Conf.COMMANDS_ON_KILL.asList(), killer, killer.getName(), player.getName());
-			}
-			pvPlayer.setLastDeathWasPvP(true);
-			if (Conf.EXP_STEAL.asDouble() > 0) {
-				final int expWon = pKiller.giveExp(pvPlayer);
-				event.setDroppedExp(0);
-				event.setNewExp(player.getTotalExperience() - expWon);
-				pvPlayer.message(Lang.EXP_STOLEN.msg(pKiller.getName(), expWon));
-			}
-		}
+		playerHandler.getDeathHandler().processDeath(event);
 	}
 
 	@EventHandler
@@ -262,29 +154,6 @@ public final void onPlayerInteract(final PlayerInteractEvent e) {
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) // cancel on low since some plugins check cancels on normal instead of monitor
-	public final void onPlayerBlockInteract(final PlayerInteractEvent e) {
-		final Player player = e.getPlayer();
-		if (!Conf.BLOCK_INTERACT_IN_COMBAT.asBool()  || e.getAction() != Action.RIGHT_CLICK_BLOCK && e.getAction() != Action.PHYSICAL
-				|| CombatUtils.isWorldExcluded(player.getWorld().getName()))
-			return;
-
-		final CombatPlayer combatPlayer = playerHandler.get(player);
-		final Block clickedBlock = e.getClickedBlock();
-		if (clickedBlock == null)
-			return;
-		if (combatPlayer.isInCombat()) {
-			final Material blockType = clickedBlock.getType();
-			for (final String material : Conf.BLOCK_INTERACT_ITEM_LIST.asList()) {
-				if (blockType.name().endsWith(material)) {
-					e.setCancelled(true);
-					combatPlayer.sendActionBar(Lang.INTERACT_BLOCKED_IN_COMBAT.msg(), 1000);
-					return;
-				}
-			}
-		}
-	}
-
 	@EventHandler(ignoreCancelled = true)
 	public final void onBucketEmpty(final PlayerBucketEmptyEvent event) {
 		final Player player = event.getPlayer();
@@ -346,7 +215,6 @@ public final void onPlayerRespawn(final PlayerRespawnEvent event) {
 		}
 		if (combatPlayer.wasLastDeathPvP()) {
 			CombatUtils.executeCommands(Conf.COMMANDS_ON_RESPAWN.asList(), event.getPlayer(), event.getPlayer().getName());
-			combatPlayer.setLastDeathWasPvP(false);
 		}
 	}