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

Disable projectiles breaking hanging entities in protected plots (related to #392)

Browse Source
This commit is contained in:
Sauilitired 2015-07-13 20:27:05 +02:00
parent 5ddb9db6ea
commit dc3c123010
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -467,7 +467,6 @@ public class PS {
/** /**
* Sort a collection of plots by world, then by hashcode * Sort a collection of plots by world, then by hashcode
* @param plots * @param plots
* @param priorityWorld
* @see #sortPlots(Collection, String) to sort with a specific priority world * @see #sortPlots(Collection, String) to sort with a specific priority world
* @see #sortPlots(Collection) to sort plots just by hashcode * @see #sortPlots(Collection) to sort plots just by hashcode
* @return ArrayList of plot * @return ArrayList of plot

32
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -60,6 +60,7 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.hanging.HangingPlaceEvent; import org.bukkit.event.hanging.HangingPlaceEvent;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.painting.PaintingBreakEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent;
import org.bukkit.event.player.PlayerBucketFillEvent; import org.bukkit.event.player.PlayerBucketFillEvent;
@ -1425,7 +1426,6 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (!Permissions.hasPermission(pp, "plots.admin.destroy.road")) { if (!Permissions.hasPermission(pp, "plots.admin.destroy.road")) {
MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.road"); MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.road");
e.setCancelled(true); e.setCancelled(true);
return;
} }
} }
} else { } else {
@ -1433,7 +1433,6 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (!Permissions.hasPermission(pp, "plots.admin.destroy.unowned")) { if (!Permissions.hasPermission(pp, "plots.admin.destroy.unowned")) {
MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.unowned"); MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.unowned");
e.setCancelled(true); e.setCancelled(true);
return;
} }
} else if (!plot.isAdded(pp.getUUID())) { } else if (!plot.isAdded(pp.getUUID())) {
if (FlagManager.isPlotFlagTrue(plot, "hanging-break")) { if (FlagManager.isPlotFlagTrue(plot, "hanging-break")) {
@ -1443,12 +1442,39 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (MainUtil.isPlotArea(l)) { if (MainUtil.isPlotArea(l)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.other"); MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.other");
e.setCancelled(true); e.setCancelled(true);
return;
} }
} }
} }
} }
} }
} else if (r instanceof Projectile) {
Projectile p = (Projectile) r;
if (p.getShooter() instanceof Player) {
Player shooter = (Player) p.getShooter();
if (PS.get().isPlotWorld(BukkitUtil.getLocation(e.getEntity()).getWorld())) {
PlotPlayer player = BukkitUtil.getPlayer(shooter);
Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(e.getEntity()));
if (plot != null) {
if (!plot.hasOwner()) {
if (!Permissions.hasPermission(player, "plots.admin.destroy.unowned")) {
MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.admin.destroy.unowned");
e.setCancelled(true);
}
} else if (!plot.isAdded(player.getUUID())) {
if (!FlagManager.isPlotFlagTrue(plot, "hanging-break")){
if (!Permissions.hasPermission(player, "plots.admin.destroy.other")) {
if (MainUtil.isPlotArea(BukkitUtil.getLocation(e.getEntity()))) {
MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.admin.destroy.other");
e.setCancelled(true);
}
}
}
}
}
}
}
} else {
e.setCancelled(true);
} }
} }

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Permissions.java
View File

@ -33,6 +33,7 @@ public enum Permissions {
return hasPermission(player, perm.s); return hasPermission(player, perm.s);
} }
public static boolean hasPermission(final PlotPlayer player, final String perm) { public static boolean hasPermission(final PlotPlayer player, final String perm) {
if ((player == null) || player.isOp() || player.hasPermission(ADMIN.s)) { if ((player == null) || player.isOp() || player.hasPermission(ADMIN.s)) {
return true; return true;