Skip to content

Fixed certain commands that teleport the player or an entity to Folia. #2919

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
me4502 merged 2 commits into from
Mar 4, 2026
Merged

Fixed certain commands that teleport the player or an entity to Folia. #2919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06862ee
Fixed certain commands that teleport the player or an entity to Folia.
Euphillya Mar 3, 2026
6b31d7a
I just saw a comment about the requirement to include its return valu…
Euphillya Mar 3, 2026
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
8 changes: 7 additions & 1 deletion worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.NullWorld;
import io.papermc.lib.PaperLib;

import java.lang.ref.WeakReference;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -76,7 +77,12 @@ public Location getLocation() {
public boolean setLocation(Location location) {
org.bukkit.entity.Entity entity = entityRef.get();
if (entity != null) {
return entity.teleport(BukkitAdapter.adapt(location));
if (WorldEditPlugin.getInstance().isFolia()) {
var unused = PaperLib.teleportAsync(entity, BukkitAdapter.adapt(location));
return true;
} else {
return entity.teleport(BukkitAdapter.adapt(location));
}
} else {
return false;
}
Expand Down
18 changes: 15 additions & 3 deletions worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.gamemode.GameMode;
import com.sk89q.worldedit.world.gamemode.GameModes;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -146,8 +147,14 @@ public void print(Component component) {

@Override
public boolean trySetPosition(Vector3 pos, float pitch, float yaw) {
return player.teleport(new Location(player.getWorld(), pos.x(), pos.y(),
pos.z(), yaw, pitch));
Location location = new Location(player.getWorld(), pos.x(), pos.y(),
pos.z(), yaw, pitch);
if (WorldEditPlugin.getInstance().isFolia()) {
var unused = PaperLib.teleportAsync(player, location);
return true;
} else {
return player.teleport(location);
}
}

@Override
Expand Down Expand Up @@ -224,7 +231,12 @@ public com.sk89q.worldedit.util.Location getLocation() {

@Override
public boolean setLocation(com.sk89q.worldedit.util.Location location) {
return player.teleport(BukkitAdapter.adapt(location));
if (WorldEditPlugin.getInstance().isFolia()) {
var unused = PaperLib.teleportAsync(player, BukkitAdapter.adapt(location));
return true;
} else {
return player.teleport(BukkitAdapter.adapt(location));
}
}

@SuppressWarnings("deprecation") // Paper's deprecation, we need to support Spigot still
Expand Down
Loading