mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
419ae9c420
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6ea679eb Allow listening to plugin messages during configuration phase (#12775) PaperMC/Paper@c3be00f0 Always call plugin message dispatch on PlayerConnection PaperMC/Paper@3fec37a9 Move the double call into the dispatch method PaperMC/Paper@108255cb Reduce PlayerLoginEvent alt behavior nag for now (#12782) PaperMC/Paper@2141ca52 Port plugins command to brigadier (#12632) PaperMC/Paper@0cadaefc Fix quitmessage nullability issues (#12783) Purpur Changes: PurpurMC/Purpur@2d8cdd15 Updated Upstream (Paper)
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 9d7591609889c62583a6406e58c38e82d4e5b627..f382beb475d2f4a28fbd276dfa6da70119cbe5ab 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1329,6 +1329,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
|