mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-06 15:51:31 +00:00
2815224ed9
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3efaf477 Add API for client-side signs (#11903) PaperMC/Paper@a3909f54 [ci/skip] Fix bad format for jd @link (#12581) PaperMC/Paper@7774243d Add plugin details to zip file errors (#12580) PaperMC/Paper@220b57ad Fixs and Improvements for EndermanEscapeEvent (#12570) PaperMC/Paper@b8fe22c9 Do not call EntityRemoveEvent during worldgen (#12588) PaperMC/Paper@ee3b4053 Replace spigot check with generation check PaperMC/Paper@84ee4249 Add Map filled event (#12574) PaperMC/Paper@b9d6ba24 Expose more data for MusicInstrument (#12415) PaperMC/Paper@a033e3b9 Fix ancient player custom name converter
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cryptite <cryptite@gmail.com>
|
|
Date: Sat, 13 Aug 2022 08:58:14 -0500
|
|
Subject: [PATCH] Slice: Smooth Teleports
|
|
|
|
Original license: MIT
|
|
Original project: https://github.com/Cryptite/Slice
|
|
|
|
Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 3baf8e5508ba6acf4331b23832dac0316cb93ca1..03c93d7f17a0c5440cb1d8078e3e241cbd1f1c41 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1381,6 +1381,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
// Paper end - Teleportation API
|
|
}
|
|
|
|
+ // Slice start
|
|
+ @Override
|
|
+ public void teleportWithoutRespawn(Location location) {
|
|
+ ServerPlayer serverPlayer = getHandle();
|
|
+ serverPlayer.smoothWorldTeleport = true;
|
|
+ teleport(location);
|
|
+ serverPlayer.smoothWorldTeleport = false;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean teleportWithoutRespawnOptionally(Location location) {
|
|
+ ServerPlayer serverPlayer = getHandle();
|
|
+ serverPlayer.smoothWorldTeleport = true;
|
|
+ boolean teleportResult = teleport(location);
|
|
+ serverPlayer.smoothWorldTeleport = false;
|
|
+ return teleportResult;
|
|
+ }
|
|
+ // Slice end
|
|
+
|
|
@Override
|
|
public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) {
|
|
// Paper start - Teleport API
|