Skip to content

Commit 9e125f4

Browse files
committed
fix: Switch to asyncTeleport (if available)
1 parent 15131be commit 9e125f4

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

spigot/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ version = versionStr
1111

1212
repositories {
1313
mavenCentral()
14+
maven {
15+
url = uri("https://repo.papermc.io/repository/maven-public/")
16+
}
1417
maven {
1518
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
1619
}
@@ -29,6 +32,7 @@ dependencies {
2932
implementation(project(":common"))
3033

3134
// Common Dependencies
35+
implementation("io.papermc:paperlib:1.0.6")
3236
implementation("org.spongepowered:configurate-core:4.1.2")
3337
implementation("org.spongepowered:configurate-yaml:4.1.2")
3438
implementation("net.kyori:adventure-api:4.10.0")
@@ -51,6 +55,7 @@ tasks {
5155
dependsOn(shadowJar)
5256
}
5357
shadowJar {
58+
relocate("io.papermc.lib", "com.funniray.minimap.paperlib")
5459
relocate("org.spongepowered.configurate", "com.funniray.minimap.configurate")
5560
relocate("net.kyori", "com.funniray.minimap.kyori")
5661
relocate("io.leangen.geantyref", "com.funniray.minimap.geantyref")

spigot/src/main/java/com/funniray/minimap/spigot/impl/SpigotPlayer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
import com.funniray.minimap.common.api.MinimapPlayer;
55
import com.funniray.minimap.common.version.Version;
66
import com.funniray.minimap.spigot.SpigotMinimap;
7+
import io.papermc.lib.PaperLib;
78
import net.kyori.adventure.platform.bukkit.MinecraftComponentSerializer;
89
import net.kyori.adventure.text.Component;
910
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
1011
import org.bukkit.Bukkit;
1112
import org.bukkit.entity.Player;
13+
import org.bukkit.event.player.PlayerTeleportEvent;
1214

1315
import java.util.UUID;
1416

@@ -31,7 +33,7 @@ public void sendMessage(Component message) {
3133

3234
@Override
3335
public void teleport(MinimapLocation location) {
34-
nativePlayer.teleport(((SpigotLocation) location).getNativeLocation());
36+
PaperLib.teleportAsync(nativePlayer, ((SpigotLocation) location).getNativeLocation(), PlayerTeleportEvent.TeleportCause.COMMAND);
3537
}
3638

3739
@Override

0 commit comments

Comments
 (0)