Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protect against ItemFrame item removal. Fixes #501

Browse Source
This commit is contained in:
Olof Larsson 2014-01-05 12:20:41 +01:00
parent b951493ea1
commit ddb1e1f3f4
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/massivecraft/factions/listeners/FactionsListenerMain.java
View File

@ -14,6 +14,7 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Enderman; import org.bukkit.entity.Enderman;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
@ -788,6 +789,26 @@ public class FactionsListenerMain implements Listener
} }
} }
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void itemFrameDamage(EntityDamageByEntityEvent event)
{
// If the damagee is an ItemFrame ...
Entity edamagee = event.getEntity();
if (!(edamagee instanceof ItemFrame)) return;
ItemFrame itemFrame = (ItemFrame)edamagee;
// ... and the liable damager is a player ...
Entity edamager = MUtil.getLiableDamager(event);
if (!(edamager instanceof Player)) return;
Player player = (Player)edamager;
// ... and the player can't build there ...
if (canPlayerBuildAt(player, PS.valueOf(itemFrame), true)) return;
// ... then cancel the event.
event.setCancelled(true);
}
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void blockBuild(BlockPlaceEvent event) public void blockBuild(BlockPlaceEvent event)
{ {