mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-06 15:51:31 +00:00
9ba16f36ed
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4d44b5fd Remove @Experimental annotation from the org.bukkit.damage package (#12898) PaperMC/Paper@4f79e9ee [ci/skip] no need to ever import non-library files ever again (#12765) PaperMC/Paper@a4da45e3 Fix typo in give command (#12905) PaperMC/Paper@ec9c83fa Adventure 4.24.0 (#12908) PaperMC/Paper@0c8efe4d [ci/skip] Remove redundant adventure version specification PaperMC/Paper@ed31825a HIDE_ADDITIONAL_TOOLTIP backwards compat. not hiding disc names (#12900)
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 32537a9a892b12258ae17c63c32e98e1b3902cb9..2d9725d2e61bb2baa0313542925e620e9bcb4942 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1333,6 +1333,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
|
|
// 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
|