Skip to content

fix: prevent graylisted players from causing creeper block damage. #356

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
junerhobart wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent graylisted players from causing creeper block damage. #356

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
32 changes: 32 additions & 0 deletions vane-admin/src/main/java/org/oddlama/vane/admin/WorldProtection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.oddlama.vane.admin;

import org.bukkit.entity.Creeper;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -11,6 +13,7 @@
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.FoodLevelChangeEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.hanging.HangingPlaceEvent;
Expand Down Expand Up @@ -57,6 +60,23 @@ public boolean deny_modify_world(final Entity entity) {
return !entity.hasPermission(permission);
}

private Player causing_player(final Creeper creeper) {
final var target = creeper.getTarget();
if (target instanceof Player) {
return (Player) target;
}

final var cause = creeper.getLastDamageCause();
if (cause instanceof EntityDamageByEntityEvent) {
final var damage_event = (EntityDamageByEntityEvent) cause;
if (damage_event.getDamager() instanceof Player) {
return (Player) damage_event.getDamager();
}
}

return null;
}

/* ************************ blocks ************************ */

@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
Expand Down Expand Up @@ -98,6 +118,18 @@ public void on_entity_combust_by_entity(EntityCombustByEntityEvent event) {
}
}

@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void on_entity_explode(EntityExplodeEvent event) {
if (event.getEntityType() != EntityType.CREEPER) {
return;
}

final var player = causing_player((Creeper) event.getEntity());
if (player != null && deny_modify_world(player)) {
event.blockList().clear();
}
}

@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void on_entity_damage(EntityDamageEvent event) {
if (event instanceof EntityDamageByEntityEvent) {
Expand Down