EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix for ItemFrames

Browse Source
This commit is contained in:
MattBDev 2019-04-30 14:44:33 -04:00
parent db6115eae5
commit ac5cdfae64
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -2803,6 +2803,13 @@ import org.bukkit.util.Vector;
return; return;
} }
Entity victim = event.getEntity(); Entity victim = event.getEntity();
if (victim.getType().equals(EntityType.ITEM_FRAME)) {
Plot plot = BukkitUtil.getLocation(victim).getPlot();
if (plot != null && !plot.isAdded(damager.getUniqueId())) {
event.setCancelled(true);
return;
}
}
if (!entityDamage(damager, victim, event.getCause())) { if (!entityDamage(damager, victim, event.getCause())) {
if (event.isCancelled()) { if (event.isCancelled()) {
if (victim instanceof Ageable) { if (victim instanceof Ageable) {
@ -2918,7 +2925,7 @@ import org.bukkit.util.Vector;
"plots.admin.destroy." + stub); "plots.admin.destroy." + stub);
return false; return false;
} }
} else if (victim.getEntityId() == 30) { } else if (victim.getType() == EntityType.ARMOR_STAND) {
if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot
.isAdded(plotPlayer.getUUID()))) { .isAdded(plotPlayer.getUUID()))) {
return true; return true;