mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2025-02-13 19:01:28 +01:00
Fixes #2240 Makes locations default to island center in IslandBaseEvent
This commit is contained in:
tastybento
parent
54ebf2dfd2
commit
f256c3af8d
@ -24,78 +24,92 @@ public abstract class IslandBaseEvent extends BentoBoxEvent implements Cancellab
|
||||
protected IslandBaseEvent newEvent;
|
||||
|
||||
public IslandBaseEvent(Island island) {
|
||||
super();
|
||||
this.island = island;
|
||||
playerUUID = island == null ? null : island.getOwner();
|
||||
admin = false;
|
||||
location = island == null ? null : island.getCenter();
|
||||
rawEvent = null;
|
||||
super();
|
||||
this.island = island;
|
||||
playerUUID = island == null ? null : island.getOwner();
|
||||
admin = false;
|
||||
location = island == null ? null : island.getCenter();
|
||||
rawEvent = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param island - island
|
||||
* @param island - island
|
||||
* @param playerUUID - the player's UUID
|
||||
* @param admin - true if ths is due to an admin event
|
||||
* @param location - the location
|
||||
* @param admin - true if ths is due to an admin event
|
||||
* @param location - the location
|
||||
*/
|
||||
public IslandBaseEvent(Island island, UUID playerUUID, boolean admin, Location location) {
|
||||
super();
|
||||
this.island = island;
|
||||
this.playerUUID = playerUUID;
|
||||
this.admin = admin;
|
||||
this.location = location;
|
||||
rawEvent = null;
|
||||
super();
|
||||
this.island = island;
|
||||
this.playerUUID = playerUUID;
|
||||
this.admin = admin;
|
||||
if (location != null) {
|
||||
this.location = location;
|
||||
} else if (island != null) {
|
||||
this.location = island.getCenter();
|
||||
} else {
|
||||
this.location = null;
|
||||
}
|
||||
rawEvent = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param island - island
|
||||
* @param island - island
|
||||
* @param playerUUID - the player's UUID
|
||||
* @param admin - true if ths is due to an admin event
|
||||
* @param location - the location
|
||||
* @param rawEvent - the raw event
|
||||
* @param admin - true if ths is due to an admin event
|
||||
* @param location - the location
|
||||
* @param rawEvent - the raw event
|
||||
*/
|
||||
public IslandBaseEvent(Island island, UUID playerUUID, boolean admin, Location location, Event rawEvent) {
|
||||
super();
|
||||
this.island = island;
|
||||
this.playerUUID = playerUUID;
|
||||
this.admin = admin;
|
||||
this.location = location;
|
||||
this.rawEvent = rawEvent;
|
||||
super();
|
||||
this.island = island;
|
||||
this.playerUUID = playerUUID;
|
||||
this.admin = admin;
|
||||
if (location != null) {
|
||||
this.location = location;
|
||||
} else if (island != null) {
|
||||
this.location = island.getCenter();
|
||||
} else {
|
||||
this.location = null;
|
||||
}
|
||||
this.rawEvent = rawEvent;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the island involved in this event. This may be null in the case of deleted islands, so use location instead
|
||||
* @return the island involved in this event. This may be null in the case of
|
||||
* deleted islands, so use location instead
|
||||
*/
|
||||
public Island getIsland(){
|
||||
return island;
|
||||
public Island getIsland() {
|
||||
return island;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the owner of the island
|
||||
*/
|
||||
public UUID getOwner() {
|
||||
return island.getOwner();
|
||||
return island.getOwner();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the playerUUID
|
||||
*/
|
||||
public UUID getPlayerUUID() {
|
||||
return playerUUID;
|
||||
return playerUUID;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the admin
|
||||
*/
|
||||
public boolean isAdmin() {
|
||||
return admin;
|
||||
return admin;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the location
|
||||
*/
|
||||
@Nullable
|
||||
public Location getLocation() {
|
||||
return location;
|
||||
return location;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -103,32 +117,34 @@ public abstract class IslandBaseEvent extends BentoBoxEvent implements Cancellab
|
||||
*/
|
||||
@Nullable
|
||||
public Event getRawEvent() {
|
||||
return rawEvent;
|
||||
return rawEvent;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCancelled() {
|
||||
return cancelled;
|
||||
return cancelled;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCancelled(boolean cancel) {
|
||||
cancelled = cancel;
|
||||
cancelled = cancel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get new event if this event is deprecated
|
||||
*
|
||||
* @return optional newEvent or empty if there is none
|
||||
*/
|
||||
public Optional<IslandBaseEvent> getNewEvent() {
|
||||
return Optional.ofNullable(newEvent);
|
||||
return Optional.ofNullable(newEvent);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the newer event so it can be obtained if this event is deprecated
|
||||
*
|
||||
* @param newEvent the newEvent to set
|
||||
*/
|
||||
public void setNewEvent(IslandBaseEvent newEvent) {
|
||||
this.newEvent = newEvent;
|
||||
this.newEvent = newEvent;
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,8 +17,10 @@ import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.PluginManager;
|
||||
import org.eclipse.jdt.annotation.NonNull;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@ -43,7 +45,7 @@ import world.bentobox.bentobox.util.Util;
|
||||
*
|
||||
*/
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest({Bukkit.class, BentoBox.class, Util.class})
|
||||
@PrepareForTest({ Bukkit.class, BentoBox.class, Util.class })
|
||||
public class AdminSetrankCommandTest extends RanksManagerBeforeClassTest {
|
||||
|
||||
@Mock
|
||||
@ -59,94 +61,100 @@ public class AdminSetrankCommandTest extends RanksManagerBeforeClassTest {
|
||||
private AdminSetrankCommand c;
|
||||
|
||||
private UUID targetUUID;
|
||||
@Mock
|
||||
private @NonNull Location location;
|
||||
|
||||
/**
|
||||
*/
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
super.setUp();
|
||||
Util.setPlugin(plugin);
|
||||
super.setUp();
|
||||
Util.setPlugin(plugin);
|
||||
|
||||
// Ranks Manager
|
||||
rm = new RanksManager();
|
||||
when(plugin.getRanksManager()).thenReturn(rm);
|
||||
// Ranks Manager
|
||||
rm = new RanksManager();
|
||||
when(plugin.getRanksManager()).thenReturn(rm);
|
||||
|
||||
// Players Manager
|
||||
when(plugin.getPlayers()).thenReturn(pm);
|
||||
// Players Manager
|
||||
when(plugin.getPlayers()).thenReturn(pm);
|
||||
|
||||
// Islands manager
|
||||
when(plugin.getIslands()).thenReturn(im);
|
||||
// Islands manager
|
||||
when(plugin.getIslands()).thenReturn(im);
|
||||
|
||||
// Target
|
||||
targetUUID = UUID.randomUUID();
|
||||
Player p = mock(Player.class);
|
||||
when(p.getUniqueId()).thenReturn(targetUUID);
|
||||
User.getInstance(p);
|
||||
// Target
|
||||
targetUUID = UUID.randomUUID();
|
||||
Player p = mock(Player.class);
|
||||
when(p.getUniqueId()).thenReturn(targetUUID);
|
||||
User.getInstance(p);
|
||||
|
||||
// Online players
|
||||
PowerMockito.mockStatic(Util.class);
|
||||
when(Util.getOnlinePlayerList(any())).thenReturn(Collections.singletonList("tastybento"));
|
||||
when(Util.getUUID(anyString())).thenCallRealMethod();
|
||||
// Online players
|
||||
PowerMockito.mockStatic(Util.class);
|
||||
when(Util.getOnlinePlayerList(any())).thenReturn(Collections.singletonList("tastybento"));
|
||||
when(Util.getUUID(anyString())).thenCallRealMethod();
|
||||
|
||||
// Translations
|
||||
when(user.getTranslation(anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
|
||||
// Translations
|
||||
when(user.getTranslation(anyString()))
|
||||
.thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
|
||||
|
||||
// Command
|
||||
c = new AdminSetrankCommand(ac);
|
||||
// Command
|
||||
c = new AdminSetrankCommand(ac);
|
||||
|
||||
// Plugin Manager
|
||||
PowerMockito.mockStatic(Bukkit.class);
|
||||
PluginManager pim = mock(PluginManager.class);
|
||||
when(Bukkit.getPluginManager()).thenReturn(pim);
|
||||
// Plugin Manager
|
||||
PowerMockito.mockStatic(Bukkit.class);
|
||||
PluginManager pim = mock(PluginManager.class);
|
||||
when(Bukkit.getPluginManager()).thenReturn(pim);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#AdminSetrankCommand(world.bentobox.bentobox.api.commands.CompositeCommand)}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#AdminSetrankCommand(world.bentobox.bentobox.api.commands.CompositeCommand)}.
|
||||
*/
|
||||
@Test
|
||||
public void testAdminSetrankCommand() {
|
||||
assertEquals("setrank", c.getLabel());
|
||||
assertEquals("setrank", c.getLabel());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#setup()}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#setup()}.
|
||||
*/
|
||||
@Test
|
||||
public void testSetup() {
|
||||
assertEquals("admin.setrank", c.getPermission());
|
||||
assertFalse(c.isOnlyPlayer());
|
||||
assertEquals("commands.admin.setrank.parameters", c.getParameters());
|
||||
assertEquals("commands.admin.setrank.description", c.getDescription());
|
||||
assertEquals("admin.setrank", c.getPermission());
|
||||
assertFalse(c.isOnlyPlayer());
|
||||
assertEquals("commands.admin.setrank.parameters", c.getParameters());
|
||||
assertEquals("commands.admin.setrank.description", c.getDescription());
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
*/
|
||||
@Test
|
||||
public void testCanExecuteNoArgs() {
|
||||
assertFalse(c.canExecute(user, "", Collections.emptyList()));
|
||||
verify(user).getTranslation("commands.help.console");
|
||||
assertFalse(c.canExecute(user, "", Collections.emptyList()));
|
||||
verify(user).getTranslation("commands.help.console");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
*/
|
||||
@Test
|
||||
public void testCanExecuteOneArg() {
|
||||
assertFalse(c.canExecute(user, "", Collections.singletonList("test")));
|
||||
verify(user).getTranslation("commands.help.console");
|
||||
assertFalse(c.canExecute(user, "", Collections.singletonList("test")));
|
||||
verify(user).getTranslation("commands.help.console");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
*/
|
||||
@Test
|
||||
public void testCanExecuteUnknownPlayer() {
|
||||
assertFalse(c.canExecute(user, "", Arrays.asList("tastybento", "member")));
|
||||
verify(user).sendMessage("general.errors.unknown-player",
|
||||
"[name]",
|
||||
"tastybento");
|
||||
assertFalse(c.canExecute(user, "", Arrays.asList("tastybento", "member")));
|
||||
verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -191,38 +199,35 @@ public class AdminSetrankCommandTest extends RanksManagerBeforeClassTest {
|
||||
assertTrue(c.canExecute(user, "", Arrays.asList("tastybento", "ranks.member")));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
*/
|
||||
@Test
|
||||
public void testExecuteUserStringListOfString() {
|
||||
// Set the target
|
||||
testCanExecuteKnownPlayerHasIslandSuccess();
|
||||
Island island = mock(Island.class);
|
||||
when(island.getRank(any(User.class))).thenReturn(RanksManager.SUB_OWNER_RANK);
|
||||
when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
|
||||
assertTrue(c.execute(user, "", Arrays.asList("tastybento", "member")));
|
||||
verify(user).sendMessage(eq("commands.admin.setrank.rank-set"),
|
||||
eq("[from]"),
|
||||
eq("ranks.sub-owner"),
|
||||
eq("[to]"),
|
||||
eq("ranks.member"),
|
||||
eq("[name]"),
|
||||
eq(null));
|
||||
// Set the target
|
||||
testCanExecuteKnownPlayerHasIslandSuccess();
|
||||
Island island = mock(Island.class);
|
||||
when(island.getRank(any(User.class))).thenReturn(RanksManager.SUB_OWNER_RANK);
|
||||
when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
|
||||
when(island.getCenter()).thenReturn(location);
|
||||
assertTrue(c.execute(user, "", Arrays.asList("tastybento", "member")));
|
||||
verify(user).sendMessage(eq("commands.admin.setrank.rank-set"), eq("[from]"), eq("ranks.sub-owner"), eq("[to]"),
|
||||
eq("ranks.member"), eq("[name]"), eq(null));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#tabComplete(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#tabComplete(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
|
||||
*/
|
||||
@Test
|
||||
public void testTabCompleteUserStringListOfString() {
|
||||
Optional<List<String>> result = c.tabComplete(user, "", Arrays.asList("setrank", ""));
|
||||
assertTrue(result.isPresent());
|
||||
result.ifPresent(list -> {
|
||||
assertEquals(1, list.size());
|
||||
assertEquals("tastybento", list.get(0));
|
||||
});
|
||||
Optional<List<String>> result = c.tabComplete(user, "", Arrays.asList("setrank", ""));
|
||||
assertTrue(result.isPresent());
|
||||
result.ifPresent(list -> {
|
||||
assertEquals(1, list.size());
|
||||
assertEquals("tastybento", list.get(0));
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user