Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature added a wildcard in the command /delhome #5919

Open
wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

Feature added a wildcard in the command /delhome #5919

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aeddf3
Feature added a wildcard in the command /delhome
AdrianOliva2 Aug 24, 2024
fee9987
Merge branch '2.x' into feature-delete-all-specific-user-homes
AdrianOliva2 Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commanddelhome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ public Commanddelhome() {
super("delhome");
}

private void deleteHome(CommandSource sender, User user, String home) {
final HomeModifyEvent event = new HomeModifyEvent(sender.getUser(), user, home, user.getHome(home), false);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
if (ess.getSettings().isDebug()) {
ess.getLogger().info("HomeModifyEvent canceled for /delhome execution by " + sender.getDisplayName());
}
return;
}

try {
user.delHome(home);
} catch (Exception e) {
sender.sendTl("invalidHome", home);
}
sender.sendTl("deleteHome", home);
}

@Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
if (args.length < 1) {
Expand Down Expand Up @@ -45,21 +63,19 @@ public void run(final Server server, final CommandSource sender, final String co
name = expandedArg[0].toLowerCase(Locale.ENGLISH);
}

if (name.equals("bed")) {
throw new TranslatableException("invalidHomeName");
}

final HomeModifyEvent event = new HomeModifyEvent(sender.getUser(), user, name, user.getHome(name), false);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
if (ess.getSettings().isDebug()) {
ess.getLogger().info("HomeModifyEvent canceled for /delhome execution by " + sender.getDisplayName());
}
return;
switch (name) {
case "bed":
throw new TranslatableException("invalidHomeName");
case "*":
final List<String> homes = user.getHomes();
for (String home : homes) {
deleteHome(sender, user, home);
}
break;
default:
deleteHome(sender, user, name);
break;
}

user.delHome(name);
sender.sendTl("deleteHome", name);
}

@Override
Expand All @@ -81,6 +97,7 @@ protected List<String> getTabCompleteOptions(final Server server, final CommandS
return homes;
}
otherUser.getHomes().forEach(home -> homes.add(namePart + ":" + home));
homes.add(namePart + ":" + "*");
}
}
return homes;
Expand Down