Skip to content

fix(folia): use the teleport adapter in /authme spawn and firstspawn #3163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xephi merged 1 commit into from
Oct 11, 2026
Merged

fix(folia): use the teleport adapter in /authme spawn and firstspawn #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion authme-core/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import fr.xephi.authme.command.PlayerCommand;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.platform.TeleportAdapter;
import fr.xephi.authme.settings.SpawnLoader;
import org.bukkit.entity.Player;

Expand All @@ -16,12 +17,15 @@ public class FirstSpawnCommand extends PlayerCommand {
@Inject
private SpawnLoader spawnLoader;

@Inject
private TeleportAdapter teleportAdapter;

@Override
public void runCommand(Player player, List<String> arguments) {
if (spawnLoader.getFirstSpawn() == null) {
messages.send(player, MessageKey.FIRST_SPAWN_NOT_DEFINED);
} else {
player.teleport(spawnLoader.getFirstSpawn());
teleportAdapter.teleportPlayer(player, spawnLoader.getFirstSpawn());
}
}
}
6 changes: 5 additions & 1 deletion authme-core/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import fr.xephi.authme.command.PlayerCommand;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.platform.TeleportAdapter;
import fr.xephi.authme.settings.SpawnLoader;
import org.bukkit.entity.Player;

Expand All @@ -13,12 +14,15 @@ public class SpawnCommand extends PlayerCommand {
@Inject
private SpawnLoader spawnLoader;

@Inject
private TeleportAdapter teleportAdapter;

@Override
public void runCommand(Player player, List<String> arguments) {
if (spawnLoader.getSpawn() == null) {
messages.send(player, MessageKey.SPAWN_NOT_DEFINED);
} else {
player.teleport(spawnLoader.getSpawn());
teleportAdapter.teleportPlayer(player, spawnLoader.getSpawn());
}
}
}
11 changes: 7 additions & 4 deletions ...e-core/src/test/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.message.Messages;
import fr.xephi.authme.platform.TeleportAdapter;
import fr.xephi.authme.settings.SpawnLoader;
import org.bukkit.Location;
import org.bukkit.entity.Player;
Expand All @@ -13,12 +14,11 @@

import java.util.Collections;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;

/**
* Test for {@link FirstSpawnCommand}.
Expand All @@ -35,6 +35,9 @@ class FirstSpawnCommandTest {
@Mock
private Messages messages;

@Mock
private TeleportAdapter teleportAdapter;

@Test
void shouldTeleportToFirstSpawn() {
// given
Expand All @@ -46,7 +49,7 @@ void shouldTeleportToFirstSpawn() {
command.executeCommand(player, Collections.emptyList());

// then
verify(player).teleport(firstSpawn);
verify(teleportAdapter).teleportPlayer(player, firstSpawn);
verify(spawnLoader, atLeastOnce()).getFirstSpawn();
}

Expand All @@ -61,6 +64,6 @@ void shouldHandleMissingFirstSpawn() {

// then
verify(messages).send(player, MessageKey.FIRST_SPAWN_NOT_DEFINED);
verify(player, never()).teleport(any(Location.class));
verifyNoInteractions(teleportAdapter);
}
}
11 changes: 7 additions & 4 deletions authme-core/src/test/java/fr/xephi/authme/command/executable/authme/SpawnCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.message.Messages;
import fr.xephi.authme.platform.TeleportAdapter;
import fr.xephi.authme.settings.SpawnLoader;
import org.bukkit.Location;
import org.bukkit.entity.Player;
Expand All @@ -13,12 +14,11 @@

import java.util.Collections;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;

/**
* Test for {@link SpawnCommand}.
Expand All @@ -35,6 +35,9 @@ class SpawnCommandTest {
@Mock
private Messages messages;

@Mock
private TeleportAdapter teleportAdapter;

@Test
void shouldTeleportToSpawn() {
// given
Expand All @@ -46,7 +49,7 @@ void shouldTeleportToSpawn() {
command.executeCommand(player, Collections.emptyList());

// then
verify(player).teleport(spawn);
verify(teleportAdapter).teleportPlayer(player, spawn);
verify(spawnLoader, atLeastOnce()).getSpawn();
}

Expand All @@ -61,6 +64,6 @@ void shouldHandleMissingSpawn() {

// then
verify(messages).send(player, MessageKey.SPAWN_NOT_DEFINED);
verify(player, never()).teleport(any(Location.class));
verifyNoInteractions(teleportAdapter);
}
}
Loading