mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2024-09-28 14:47:30 +02:00
Fixed tests and commands relying on previously broken API
Mistakenly pushed the previous changes on develop before committing these fixes.
This commit is contained in:
parent
a071f97538
commit
20b6c4a7cb
@ -60,7 +60,7 @@ public class AdminRegisterCommand extends ConfirmableCommand {
|
||||
// Register island if it exists
|
||||
if (!island.map(i -> {
|
||||
// Island exists
|
||||
getIslands().makeLeader(user, targetUUID, i, getPermissionPrefix());
|
||||
getIslands().setOwner(user, targetUUID, i);
|
||||
user.sendMessage("commands.admin.register.registered-island", "[xyz]", Util.xyz(i.getCenter().toVector()));
|
||||
user.sendMessage("general.success");
|
||||
return true;
|
||||
@ -70,7 +70,7 @@ public class AdminRegisterCommand extends ConfirmableCommand {
|
||||
this.askConfirmation(user, () -> {
|
||||
// Make island here
|
||||
Island i = getIslands().createIsland(getClosestIsland(user.getLocation()), targetUUID);
|
||||
getIslands().makeLeader(user, targetUUID, i, getPermissionPrefix());
|
||||
getIslands().setOwner(user, targetUUID, i);
|
||||
getWorld().getBlockAt(i.getCenter()).setType(Material.BEDROCK);
|
||||
user.sendMessage("commands.admin.register.registered-island", "[xyz]", Util.xyz(i.getCenter().toVector()));
|
||||
user.sendMessage("general.success");
|
||||
|
@ -46,7 +46,7 @@ public class AdminTeamMakeLeaderCommand extends CompositeCommand {
|
||||
return false;
|
||||
}
|
||||
// Make new leader
|
||||
getIslands().makeLeader(getWorld(), user, targetUUID, getPermissionPrefix());
|
||||
getIslands().setOwner(getWorld(), user, targetUUID);
|
||||
user.sendMessage("general.success");
|
||||
return true;
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ public class IslandTeamSetownerCommand extends CompositeCommand {
|
||||
if (event.isCancelled()) {
|
||||
return false;
|
||||
}
|
||||
getIslands().makeLeader(getWorld(), user, targetUUID, getPermissionPrefix());
|
||||
getIslands().setOwner(getWorld(), user, targetUUID);
|
||||
getIslands().save(true);
|
||||
return true;
|
||||
}
|
||||
|
@ -188,7 +188,7 @@ public class AdminTeamMakeLeaderCommandTest {
|
||||
AdminTeamMakeLeaderCommand itl = new AdminTeamMakeLeaderCommand(ac);
|
||||
assertTrue(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
|
||||
// Add other verifications
|
||||
Mockito.verify(im).makeLeader(Mockito.any(), Mockito.eq(user), Mockito.eq(notUUID), Mockito.any());
|
||||
Mockito.verify(im).setOwner(Mockito.any(), Mockito.eq(user), Mockito.eq(notUUID));
|
||||
Mockito.verify(user).sendMessage(Mockito.eq("general.success"));
|
||||
}
|
||||
|
||||
|
@ -434,14 +434,14 @@ public class IslandsManagerTest {
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getCount()}.
|
||||
* Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getIslandCount()}.
|
||||
*/
|
||||
@Test
|
||||
public void testGetCount() {
|
||||
IslandsManager im = new IslandsManager(plugin);
|
||||
assertTrue(im.getCount() == 0);
|
||||
assertTrue(im.getIslandCount() == 0);
|
||||
im.createIsland(location, UUID.randomUUID());
|
||||
assertTrue(im.getCount() == 1);
|
||||
assertTrue(im.getIslandCount() == 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user