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

Ignore falling blocks that pass through portals.

Browse Source 
This is due to CB erroneously firing EntityChangeBlockEvent twice when a
falling block falls through an end portal
This commit is contained in:
RoboMWM 2016-08-26 19:59:03 -07:00
parent 3894223f83
commit 359f5f50d1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -73,6 +73,7 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityInteractEvent; import org.bukkit.event.entity.EntityInteractEvent;
import org.bukkit.event.entity.EntityPortalEnterEvent;
import org.bukkit.event.entity.ExpBottleEvent; import org.bukkit.event.entity.ExpBottleEvent;
import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.PotionSplashEvent; import org.bukkit.event.entity.PotionSplashEvent;
@ -172,7 +173,8 @@ public class EntityEventHandler implements Listener
else else
{ {
List<MetadataValue> values = entity.getMetadata("GP_FALLINGBLOCK"); List<MetadataValue> values = entity.getMetadata("GP_FALLINGBLOCK");
//If entity fell through an end portal, allow it to form, as the event is erroneously fired twice in this scenario.
if (entity.hasMetadata("GP_FELLTHROUGHPORTAL")) return;
//if we're not sure where this entity came from (maybe another plugin didn't follow the standard?), allow the block to form //if we're not sure where this entity came from (maybe another plugin didn't follow the standard?), allow the block to form
if(values.size() < 1) return; if(values.size() < 1) return;
@ -204,6 +206,15 @@ public class EntityEventHandler implements Listener
} }
} }
} }
//Used by "sand cannon" fix to ignore fallingblocks that fell through End Portals
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onFallingBlockEnterPortal(EntityPortalEnterEvent event)
{
if (event.getEntityType() != EntityType.FALLING_BLOCK)
return;
event.getEntity().setMetadata("GP_FELLTHROUGHPORTAL", new FixedMetadataValue(GriefPrevention.instance, true));
}
//don't allow zombies to break down doors //don't allow zombies to break down doors
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)