Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent expel tab-complete from detecting invisible players. 

https://github.com/BentoBoxWorld/BentoBox/issues/972
This commit is contained in:
tastybento 2020-09-02 21:50:25 -07:00
parent 9ff62dad2a
commit e9370b9a05
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java
View File

@ -144,13 +144,17 @@ public class IslandExpelCommand extends CompositeCommand {
user.sendMessage(CANNOT_EXPEL);
return false;
}
@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
Island island = getIslands().getIsland(getWorld(), user);
if (island != null) {
List<String> options = island.getPlayersOnIsland().stream()
.filter(p -> !p.equals(user.getPlayer()))
.filter(p -> !p.equals(user.getPlayer())) // Not self
.filter(p -> user.getPlayer().canSee(p)) // Not invisible
.filter(p -> !p.isOp()) // Not op
.filter(p -> !p.hasPermission(this.getPermissionPrefix() + "admin.noexpel"))
.filter(p -> !p.hasPermission(this.getPermissionPrefix() + "mod.bypassexpel"))
.map(Player::getName).collect(Collectors.toList());
String lastArg = !args.isEmpty() ? args.get(args.size()-1) : "";

58
src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java
View File

@ -11,9 +11,11 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
@ -81,6 +83,8 @@ public class IslandExpelCommandTest {
private IslandExpelCommand iec;
@Mock
private Server server;
@Mock
private Player p;
@Before
public void setUp() throws Exception {
@ -98,7 +102,6 @@ public class IslandExpelCommandTest {
when(plugin.getSettings()).thenReturn(s);
// Player
Player p = mock(Player.class);
// Sometimes use Mockito.withSettings().verboseLogging()
// User
when(user.isOp()).thenReturn(false);
@ -437,4 +440,57 @@ public class IslandExpelCommandTest {
verify(user).sendMessage("commands.island.expel.cannot-expel");
}
/**
* Test method for {@link world.bentobox.bentobox.api.commands.island.IslandExpelCommand#tabComplete(User, String, java.util.List)}
*/
@Test
public void testTabCompleteUserStringListNoIsland() {
when(im.getIsland(any(), any(User.class))).thenReturn(null);
assertFalse(iec.tabComplete(user, "", Collections.emptyList()).isPresent());
}
/**
* Test method for {@link world.bentobox.bentobox.api.commands.island.IslandExpelCommand#tabComplete(User, String, java.util.List)}
*/
@Test
public void testTabCompleteUserStringListNoPlayersOnIsland() {
assertTrue(iec.tabComplete(user, "", Collections.emptyList()).get().isEmpty());
}
/**
* Test method for {@link world.bentobox.bentobox.api.commands.island.IslandExpelCommand#tabComplete(User, String, java.util.List)}
*/
@Test
public void testTabCompleteUserStringListPlayersOnIsland() {
List<Player> list = new ArrayList<>();
Player p1 = mock(Player.class);
when(p1.getName()).thenReturn("normal");
when(p.canSee(p1)).thenReturn(true);
Player p2 = mock(Player.class);
when(p2.getName()).thenReturn("op");
when(p.canSee(p2)).thenReturn(true);
when(p2.isOp()).thenReturn(true);
Player p3 = mock(Player.class);
when(p3.getName()).thenReturn("invisible");
Player p4 = mock(Player.class);
when(p4.getName()).thenReturn("adminPerm");
when(p.canSee(p4)).thenReturn(true);
when(p4.hasPermission(eq("bskyblock.admin.noexpel"))).thenReturn(true);
Player p5 = mock(Player.class);
when(p5.getName()).thenReturn("modPerm");
when(p.canSee(p5)).thenReturn(true);
when(p5.hasPermission(eq("bskyblock.mod.bypassexpel"))).thenReturn(true);
list.add(p1);
list.add(p2);
list.add(p3);
list.add(p4);
list.add(p5);
list.add(p1);
when(island.getPlayersOnIsland()).thenReturn(list);
List<String> result = iec.tabComplete(user, "", Collections.emptyList()).get();
assertFalse(result.isEmpty());
assertEquals(2, result.size());
assertEquals("normal", result.get(0));
assertEquals("normal", result.get(1));
}
}