Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-28 12:56:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add admin permission override to edit signs (#4287)

Browse Source 
* add admin permission override to edit signs

* include sign dying
This commit is contained in:
Hannes Greule 2024-01-06 11:28:33 +01:00 committed by GitHub
parent ead7acdd76
commit 449af2f3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
View File

@ -252,7 +252,8 @@ public class PlayerEventListener implements Listener {
} }
Plot plot = location.getOwnedPlot(); Plot plot = location.getOwnedPlot();
if (plot == null) { if (plot == null) {
if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) { if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
&& !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
event.setCancelled(true); event.setCancelled(true);
} }
return; return;
@ -260,7 +261,8 @@ public class PlayerEventListener implements Listener {
if (plot.isAdded(event.getPlayer().getUniqueId())) { if (plot.isAdded(event.getPlayer().getUniqueId())) {
return; // allow for added players return; // allow for added players
} }
if (!plot.getFlag(EditSignFlag.class)) { if (!plot.getFlag(EditSignFlag.class)
&& !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false"); plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false");
event.setCancelled(true); event.setCancelled(true);
} }

7
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener1201.java
View File

@ -20,6 +20,7 @@ package com.plotsquared.bukkit.listener;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.core.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.flag.implementations.EditSignFlag; import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
@ -46,7 +47,8 @@ public class PlayerEventListener1201 implements Listener {
} }
Plot plot = location.getOwnedPlot(); Plot plot = location.getOwnedPlot();
if (plot == null) { if (plot == null) {
if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) { if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
&& !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
event.setCancelled(true); event.setCancelled(true);
} }
return; return;
@ -54,7 +56,8 @@ public class PlayerEventListener1201 implements Listener {
if (plot.isAdded(event.getPlayer().getUniqueId())) { if (plot.isAdded(event.getPlayer().getUniqueId())) {
return; // allow for added players return; // allow for added players
} }
if (!plot.getFlag(EditSignFlag.class)) { if (!plot.getFlag(EditSignFlag.class)
&& !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false"); plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false");
event.setCancelled(true); event.setCancelled(true);
} }