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

Merge pull request #2500 from 56738/remove-everyone

Browse Source 
Make removing * remove the Everyone node before removing all members
This commit is contained in:
Matt 2019-09-09 14:34:39 -04:00 committed by GitHub
commit 26e851fcf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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]);
if (!uuids.isEmpty()) {
for (UUID uuid : uuids) {
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++;
}
} else if (plot.getTrusted().contains(uuid)) {
if (plot.getTrusted().contains(uuid)) {
if (plot.removeTrusted(uuid)) {
EventUtil.manager.callTrusted(player, plot, uuid, false);
count++;
@ -92,6 +81,17 @@ import java.util.UUID;
EventUtil.manager.callDenied(player, plot, uuid, false);
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++;
}
}
}
}