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

Make removing * remove the Everyone node before removing all members

Browse Source
This commit is contained in:
56738 2019-09-09 18:44:36 +02:00
parent ecfb71b08f
commit 5b3426f4ac
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
View File

@ -66,18 +66,7 @@ import java.util.UUID;
Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]); Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
if (!uuids.isEmpty()) { if (!uuids.isEmpty()) {
for (UUID uuid : uuids) { for (UUID uuid : uuids) {
if (uuid == DBFunc.EVERYONE) { if (plot.getTrusted().contains(uuid)) {
if (plot.removeTrusted(uuid)) {
EventUtil.manager.callTrusted(player, plot, uuid, false);
count++;
} else if (plot.removeMember(uuid)) {
EventUtil.manager.callMember(player, plot, uuid, false);
count++;
} else if (plot.removeDenied(uuid)) {
EventUtil.manager.callDenied(player, plot, uuid, false);
count++;
}
} else if (plot.getTrusted().contains(uuid)) {
if (plot.removeTrusted(uuid)) { if (plot.removeTrusted(uuid)) {
EventUtil.manager.callTrusted(player, plot, uuid, false); EventUtil.manager.callTrusted(player, plot, uuid, false);
count++; count++;
@ -92,6 +81,17 @@ import java.util.UUID;
EventUtil.manager.callDenied(player, plot, uuid, false); EventUtil.manager.callDenied(player, plot, uuid, false);
count++; count++;
} }
} else if (uuid == DBFunc.EVERYONE) {
if (plot.removeTrusted(uuid)) {
EventUtil.manager.callTrusted(player, plot, uuid, false);
count++;
} else if (plot.removeMember(uuid)) {
EventUtil.manager.callMember(player, plot, uuid, false);
count++;
} else if (plot.removeDenied(uuid)) {
EventUtil.manager.callDenied(player, plot, uuid, false);
count++;
}
} }
} }
} }