Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve block ignition handling (#931)

Browse Source 
* Improve arrow ignition handling

* Allow fireball/arrow ignition from same claim

* Allow fires to be started by dispensers in same claim
This commit is contained in:
Adam 2020-08-07 13:20:35 -04:00 committed by GitHub
parent fb53c1811e
commit a3d0aecaf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
View File

@ -33,6 +33,7 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Hopper;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.type.Dispenser;
import org.bukkit.entity.Fireball;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
@ -59,6 +60,8 @@ import org.bukkit.event.world.StructureGrowEvent;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.projectiles.BlockProjectileSource;
import org.bukkit.projectiles.ProjectileSource;
import java.util.ArrayList;
import java.util.Collection;
@ -672,6 +675,51 @@ public class BlockEventHandler implements Listener
// }
}
// If a fire is started by a fireball from a dispenser, allow it if the dispenser is in the same claim.
if (igniteEvent.getCause() == IgniteCause.FIREBALL && igniteEvent.getIgnitingEntity() instanceof Fireball)
{
ProjectileSource shooter = ((Fireball) igniteEvent.getIgnitingEntity()).getShooter();
if (shooter instanceof BlockProjectileSource)
{
Claim claim = GriefPrevention.instance.dataStore.getClaimAt(igniteEvent.getBlock().getLocation(), false, null);
if (claim != null && GriefPrevention.instance.dataStore.getClaimAt(((BlockProjectileSource) shooter).getBlock().getLocation(), false, claim) == claim)
{
return;
}
}
}
// Handle arrows igniting TNT.
if (igniteEvent.getCause() == IgniteCause.ARROW)
{
Claim claim = GriefPrevention.instance.dataStore.getClaimAt(igniteEvent.getBlock().getLocation(), false, null);
if (claim == null)
{
// Only TNT can be ignited by arrows, so the targeted block will be destroyed by completion.
if (!GriefPrevention.instance.config_fireDestroys || !GriefPrevention.instance.config_fireSpreads)
igniteEvent.setCancelled(true);
return;
}
if (igniteEvent.getIgnitingEntity() instanceof Projectile)
{
ProjectileSource shooter = ((Projectile) igniteEvent.getIgnitingEntity()).getShooter();
// Allow ignition if arrow was shot by a player with build permission.
if (shooter instanceof Player && claim.allowBuild((Player) shooter, Material.TNT) == null) return;
// Allow ignition if arrow was shot by a dispenser in the same claim.
if (shooter instanceof BlockProjectileSource &&
GriefPrevention.instance.dataStore.getClaimAt(((BlockProjectileSource) shooter).getBlock().getLocation(), false, claim) == claim)
return;
}
// Block all other ignition by arrows in claims.
igniteEvent.setCancelled(true);
return;
}
if (!GriefPrevention.instance.config_fireSpreads && igniteEvent.getCause() != IgniteCause.FLINT_AND_STEEL && igniteEvent.getCause() != IgniteCause.LIGHTNING)
{
igniteEvent.setCancelled(true);