blocked hits tava contando no lobby tb

This commit is contained in:
nearfe 2024-06-16 03:25:29 -03:00
parent 75542da8b1
commit 207b276279
1 changed files with 8 additions and 3 deletions

View File

@ -128,19 +128,24 @@ public class MatchListener implements Listener {
@EventHandler @EventHandler
public void onEntityDamage(EntityDamageByEntityEvent event) { public void onEntityDamage(EntityDamageByEntityEvent event) {
if (event.getEntity() instanceof Player && event.getDamager() instanceof Player) { if (event.getEntity() instanceof Player && event.getDamager() instanceof Player) {
Player defender = (Player) event.getEntity(); Player defender = (Player) event.getEntity();
final Player player = (Player) event.getEntity();
final PlayerData playerData = this.plugin.getPlayerManager().getPlayerData(player.getUniqueId());
if (defender.isBlocking() && defender.getInventory().getItemInHand().getType().toString().contains("SWORD")) { if (defender.isBlocking() && defender.getInventory().getItemInHand().getType().toString().contains("SWORD")) {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (defender.isBlocking() && counter >= 20) { if (playerData.getPlayerState() == PlayerState.FIGHTING) {
if (defender.isBlocking() && counter >= 20) {
defender.setHealth(defender.getHealth() - 1.0); defender.setHealth(defender.getHealth() - 1.0);
cancel(); cancel();
} else if (defender.isBlocking()) { } else if (defender.isBlocking()) {
counter++; counter++;
} }
}
} }
}.runTaskAsynchronously(Practice.getInstance()); }.runTaskAsynchronously(Practice.getInstance());
} }
@ -258,7 +263,7 @@ public class MatchListener implements Listener {
} }
match.broadcast(CC.GRAY + " "); match.broadcast(CC.GRAY + " ");
match.broadcast(Color.MAIN_COLOR + "Match Overview" + CC.GRAY + " (click to view inventories)"); match.broadcast(Color.MAIN_COLOR + "Match Overview" + CC.GRAY + CC.ITALIC + " (click to view inventories)");
final ChatComponentBuilder wInventories = new ChatComponentBuilder(""); final ChatComponentBuilder wInventories = new ChatComponentBuilder("");
final ChatComponentBuilder lInventories = new ChatComponentBuilder(""); final ChatComponentBuilder lInventories = new ChatComponentBuilder("");