Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-22 10:45:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixes creeper ignation by visitors (#2375)

Browse Source 
This fixes a long-standing bug which was introduced with a code that prevented hostile entities from targeting visitors.  

As player was not a target for creeper it allowed it to explode.

This code change prevents visitors from igniting creepers as I do not see a reason why we should allow them to ignite them, while still protecting from griefing. 

Addresses issue reported in #2372
This commit is contained in:
BONNe 2024-05-24 17:22:20 +03:00 committed by GitHub
parent 888b485f82
commit 885d2449d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java
View File

@ -1,5 +1,8 @@
package world.bentobox.bentobox.listeners.flags.worldsettings;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
@ -8,6 +11,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.localization.TextVariables;
@ -68,4 +72,33 @@ public class CreeperListener extends FlagListener {
e.setCancelled(true);
}
}
/**
* Prevent creepers from igniting if they are not allowed to grief
* @param e - event
* @since 2.4.0
*/
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerInteractEntity(PlayerInteractEntityEvent e)
{
Player player = e.getPlayer();
Location location = e.getRightClicked().getLocation();
if (!Flags.CREEPER_GRIEFING.isSetForWorld(location.getWorld()) &&
e.getRightClicked() instanceof Creeper &&
!this.getIslandsManager().locationIsOnIsland(player, location))
{
Material mainHand = player.getInventory().getItemInMainHand().getType();
if (Material.FIRE_CHARGE.equals(mainHand) ||
Material.FLINT_AND_STEEL.equals(mainHand))
{
// Creeper igniting
User user = User.getInstance(player);
user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation(Flags.CREEPER_GRIEFING.getHintReference()));
e.setCancelled(true);
}
}
}
}