Skip to content

fix: only cancel ExplosionPrimeEvent if entity is a wind charge #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EepyRose wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: only cancel ExplosionPrimeEvent if entity is a wind charge #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/main/java/org/me/pyke/nowindcharge/WindChargeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,21 @@ public void onPlayerUseWindCharge(PlayerInteractEvent event) {

@EventHandler
public void onWindChargeExplosion(ExplosionPrimeEvent event) {
// Early return if the entity is not a WIND_CHARGE or BREEZE_WIND_CHARGE
if (event.getEntity().getType() != EntityType.WIND_CHARGE && event.getEntity().getType() != EntityType.BREEZE_WIND_CHARGE) {
return;
}

// Check if the plugin is completely disabled for WIND_CHARGE
if (plugin.getConfig().getBoolean("disable-completely", false)) {
event.setCancelled(true);
return;
}

if (event.getEntity().getType() == EntityType.WIND_CHARGE || event.getEntity().getType() == EntityType.BREEZE_WIND_CHARGE) {
for (Player player : event.getEntity().getWorld().getPlayers()) {
if (player.getLocation().distanceSquared(event.getEntity().getLocation()) < 16 && isInExcludedRegion(player)) {
event.setCancelled(true);
return;
}
for (Player player : event.getEntity().getWorld().getPlayers()) {
if (player.getLocation().distanceSquared(event.getEntity().getLocation()) < 16 && isInExcludedRegion(player)) {
event.setCancelled(true);
return;
}
}
}
Expand Down