Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-28 13:45:14 +01:00
Code Issues Projects Releases Wiki Activity

Changed island team kick to use confirm API

Browse Source 
Fix for:
https://github.com/BentoBoxWorld/bentobox/issues/214
This commit is contained in:
tastybento 2018-08-03 19:22:35 -07:00
parent bad870d3da
commit 53f28eb68d
2 changed files with 43 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java
View File

@ -1,19 +1,13 @@
package world.bentobox.bentobox.api.commands.island.team; package world.bentobox.bentobox.api.commands.island.team;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.bukkit.scheduler.BukkitRunnable;
import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.api.user.User;
public class IslandTeamKickCommand extends CompositeCommand { public class IslandTeamKickCommand extends CompositeCommand {
Set<UUID> kickSet;
public IslandTeamKickCommand(CompositeCommand islandTeamCommand) { public IslandTeamKickCommand(CompositeCommand islandTeamCommand) {
super(islandTeamCommand, "kick"); super(islandTeamCommand, "kick");
} }
@ -24,7 +18,6 @@ public class IslandTeamKickCommand extends CompositeCommand {
setOnlyPlayer(true); setOnlyPlayer(true);
setParameters("commands.island.team.kick.parameters"); setParameters("commands.island.team.kick.parameters");
setDescription("commands.island.team.kick.description"); setDescription("commands.island.team.kick.description");
kickSet = new HashSet<>();
} }
@Override @Override
@ -56,8 +49,16 @@ public class IslandTeamKickCommand extends CompositeCommand {
user.sendMessage("general.errors.not-in-team"); user.sendMessage("general.errors.not-in-team");
return false; return false;
} }
if (!getSettings().isKickConfirmation() || kickSet.contains(targetUUID)) { if (!getSettings().isKickConfirmation()) {
kickSet.remove(targetUUID); kick(user, targetUUID);
return true;
} else {
this.askConfirmation(user, () -> kick(user, targetUUID));
return false;
}
}
private void kick(User user, UUID targetUUID) {
User.getInstance(targetUUID).sendMessage("commands.island.team.kick.leader-kicked"); User.getInstance(targetUUID).sendMessage("commands.island.team.kick.leader-kicked");
getIslands().removePlayer(getWorld(), targetUUID); getIslands().removePlayer(getWorld(), targetUUID);
// Remove money inventory etc. // Remove money inventory etc.
@ -71,21 +72,6 @@ public class IslandTeamKickCommand extends CompositeCommand {
// TODO: needs Vault // TODO: needs Vault
} }
user.sendMessage("general.success"); user.sendMessage("general.success");
return true;
} else {
user.sendMessage("commands.island.team.kick.type-again");
kickSet.add(targetUUID);
new BukkitRunnable() {
@Override
public void run() {
if (kickSet.contains(targetUUID)) {
kickSet.remove(targetUUID);
user.sendMessage("general.errors.command-cancelled");
}
}}.runTaskLater(getPlugin(), getSettings().getKickWait() * 20);
return false;
}
} }

2
src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java
View File

@ -232,7 +232,7 @@ public class IslandTeamKickCommandTest {
IslandTeamKickCommand itl = new IslandTeamKickCommand(ic); IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
// Confirmation required // Confirmation required
Mockito.verify(user).sendMessage(Mockito.eq("commands.island.team.kick.type-again")); Mockito.verify(user).sendMessage(Mockito.eq("general.confirm"), Mockito.eq("[seconds]"), Mockito.eq("0"));
} }
/** /**