Skip to content

Commit 82fe350

Browse files
authored
Merge pull request #3429 from Multiverse/feat/apply-passenger-mode
Apply passenger mode to join location and first spawn as well
2 parents a7b4b9b + 8347cf8 commit 82fe350

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/main/java/org/mvplugins/multiverse/core/config/CoreConfigNodes.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,10 @@ private <N extends Node> N node(N node) {
220220

221221
final ConfigNode<PassengerModes> passengerMode = node(ConfigNode.builder("teleport.passenger-mode", PassengerModes.class)
222222
.comment("")
223-
.comment("Configures how passengers and vehicles are handled when an entity is teleported.")
223+
.comment("Configures how passengers and vehicles are handled when an entity is teleported. This config is")
224+
.comment("only applied to /mvtp, join-destination and first-spawn-override. It will not touch any other")
225+
.comment("teleport by other plugins or commands.")
226+
.comment("========= Available options: =========")
224227
.comment(" default: Server will handle passengers and vehicles. On papermc 1.21.10+, all will be retained by default.")
225228
.comment(" On older versions, all will be dismounted if world changes.")
226229
.comment(" dismount_passengers: Passengers will be removed from the parent entity before the teleport.")

src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private void handleJoinLocation(Player player) {
244244
}
245245

246246
private void teleportToDestinationOnJoin(Player player, DestinationInstance<?, ?> destination) {
247-
asyncSafetyTeleporter.to(destination).teleportSingle(player)
247+
asyncSafetyTeleporter.to(destination).passengerMode(config.getPassengerMode()).teleportSingle(player)
248248
.onSuccess(result -> Logging.fine("Player %s has been teleported on join",
249249
player.getName()))
250250
.onFailure(failure -> Logging.warning("Failed to teleport player %s on join: %s",

0 commit comments

Comments
 (0)