maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds /metropolis-plot-go command to teleport to a plot.

Browse Source
This commit is contained in:
Tom Hicks
2026-09-27 04:59:16 -07:00
parent b6b30621f0
commit da46d3e4b9
11 changed files with 379 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/test/java/com/majinnaibu/bukkitplugins/metropolis/PlotReservationLookupTest.java Normal file
View File

@@ -0,0 +1,83 @@
/*
This file is part of Metropolis.
Metropolis is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Metropolis is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/
package com.majinnaibu.bukkitplugins.metropolis;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import java.util.UUID;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldguard.protection.flags.Flags;
import com.sk89q.worldguard.protection.flags.StateFlag;
import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
import org.junit.jupiter.api.Test;
class PlotReservationLookupTest {
private static final UUID PLAYER_ID = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
@Test
void findsReservationsWherePlayerIsOwnerOrMemberButExcludesHomeCityAndSpawn() {
ProtectedCuboidRegion memberReservation = region("r_member");
memberReservation.getMembers().addPlayer(PLAYER_ID);
ProtectedCuboidRegion ownerReservation = region("private-yard");
ownerReservation.getOwners().addPlayer(PLAYER_ID);
ProtectedCuboidRegion home = region("h_1_" + PLAYER_ID);
home.getMembers().addPlayer(PLAYER_ID);
ProtectedCuboidRegion city = region("City");
city.getMembers().addPlayer(PLAYER_ID);
ProtectedCuboidRegion spawn = region("Spawn");
spawn.getMembers().addPlayer(PLAYER_ID);
ProtectedCuboidRegion unrelated = region("other-region", false);
unrelated.getMembers().addPlayer(PLAYER_ID);
List<Plot> reservations =
PlotReservationLookup.forPlayer(
List.of(memberReservation, ownerReservation, home, city, spawn, unrelated), PLAYER_ID);
assertEquals(
List.of("private-yard", "r_member"),
reservations.stream().map(Plot::getRegionName).toList());
}
@Test
void findsNamedReservationWithOrWithoutPrefix() {
ProtectedCuboidRegion reservation = region("r_camp");
reservation.getMembers().addPlayer(PLAYER_ID);
List<Plot> reservations = PlotReservationLookup.forPlayer(List.of(reservation), PLAYER_ID);
assertEquals("r_camp", PlotReservationLookup.findByName(reservations, "camp").getRegionName());
assertEquals(
"r_camp", PlotReservationLookup.findByName(reservations, "r_camp").getRegionName());
}
private static ProtectedCuboidRegion region(String id) {
return region(id, true);
}
private static ProtectedCuboidRegion region(String id, boolean reservedFlags) {
ProtectedCuboidRegion region =
new ProtectedCuboidRegion(id, BlockVector3.ZERO, BlockVector3.at(5, 5, 5));
if (reservedFlags) {
region.setFlag(Flags.LAVA_FLOW, StateFlag.State.DENY);
region.setFlag(Flags.SNOW_FALL, StateFlag.State.DENY);
}
return region;
}
}

115
src/test/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotGoCommandTest.java Normal file
View File

@@ -0,0 +1,115 @@
/*
This file is part of Metropolis.
Metropolis is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Metropolis is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/
package com.majinnaibu.bukkitplugins.metropolis.commands;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.List;
import java.util.UUID;
import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
import com.majinnaibu.bukkitplugins.metropolis.Plot;
import com.sk89q.worldedit.math.BlockVector3;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.junit.jupiter.api.Test;
class MetropolisPlotGoCommandTest {
private static final UUID PLAYER_ID = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
@Test
void teleportsPlayerToTheirOnlyReservation() {
MetropolisPlugin plugin = mock(MetropolisPlugin.class);
Player player = player("Member", PLAYER_ID);
Plot reservation = plot("r_camp");
when(plugin.getReservationsForPlayer(PLAYER_ID)).thenReturn(List.of(reservation));
MetropolisPlotGoCommand command = new MetropolisPlotGoCommand(plugin);
assertTrue(command.onCommand(player, mock(Command.class), "plot-go", new String[0]));
verify(plugin).teleportPlayerToPlot(player, reservation);
verify(player).sendMessage(contains("reservation r_camp"));
}
@Test
void asksForAReservationNameWhenPlayerBelongsToSeveral() {
MetropolisPlugin plugin = mock(MetropolisPlugin.class);
Player player = player("Member", PLAYER_ID);
when(plugin.getReservationsForPlayer(PLAYER_ID))
.thenReturn(List.of(plot("r_camp"), plot("r_garden")));
MetropolisPlotGoCommand command = new MetropolisPlotGoCommand(plugin);
assertFalse(command.onCommand(player, mock(Command.class), "plot-go", new String[0]));
verify(player).sendMessage(contains("r_camp, r_garden"));
verify(plugin, never()).teleportPlayerToPlot(player, plot("r_camp"));
}
@Test
void authorizedSenderCanTargetAnOnlineMember() {
MetropolisPlugin plugin = mock(MetropolisPlugin.class);
CommandSender sender = mock(CommandSender.class);
Player target = player("Member", PLAYER_ID);
Plot reservation = plot("r_camp");
when(sender.hasPermission("metropolis.plot.go")).thenReturn(true);
when(plugin.getPlayer("Member")).thenReturn(target);
when(plugin.getReservationsForPlayer(PLAYER_ID)).thenReturn(List.of(reservation));
MetropolisPlotGoCommand command = new MetropolisPlotGoCommand(plugin);
assertTrue(command.onCommand(sender, mock(Command.class), "plot-go", new String[] {"Member"}));
verify(plugin).teleportPlayerToPlot(target, reservation);
verify(target).sendMessage(contains("You were teleported"));
}
@Test
void reportsNoMembershipAndUnsafeDestinations() {
MetropolisPlugin plugin = mock(MetropolisPlugin.class);
Player player = player("Member", PLAYER_ID);
when(plugin.getReservationsForPlayer(PLAYER_ID)).thenReturn(List.of());
MetropolisPlotGoCommand command = new MetropolisPlotGoCommand(plugin);
assertFalse(command.onCommand(player, mock(Command.class), "plot-go", new String[0]));
verify(player).sendMessage(contains("not a member or owner"));
Plot reservation = plot("r_camp");
when(plugin.getReservationsForPlayer(PLAYER_ID)).thenReturn(List.of(reservation));
when(plugin.teleportPlayerToPlot(player, reservation)).thenReturn("No safe teleport location");
assertFalse(command.onCommand(player, mock(Command.class), "plot-go", new String[0]));
verify(player).sendMessage(contains("No safe teleport location"));
}
private static Player player(String name, UUID id) {
Player player = mock(Player.class);
when(player.getName()).thenReturn(name);
when(player.getUniqueId()).thenReturn(id);
return player;
}
private static Plot plot(String name) {
return new Plot(name, BlockVector3.ZERO, BlockVector3.at(5, 5, 5));
}
}