mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
cb403fe2cd
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1f93f566 [ci/skip] Improve getPotentialBedLocation deprecation (#12857) PaperMC/Paper@6fb36e34 Replace compileOnly with implementation for test visibility (#12841) PaperMC/Paper@aa4ef067 Update DataConverter constants for 1.21.8 PaperMC/Paper@f7c59f91 Fix broken resource pack API when configured in configuration stage (#12866) PaperMC/Paper@0dad7f15 Add Bee#set/getTimeSinceSting() methods (#12792) PaperMC/Paper@782ce950 Allow forcing break effects when using breakNaturally (#12734) PaperMC/Paper@a2d37f12 Remove invalid team colors nicely (#12874) PaperMC/Paper@617e5a46 Update to configurate 4.2.0 (#12869) PaperMC/Paper@602ea9f0 Restore previous PlayerToggleSneakEvent behaviour (#12815) PaperMC/Paper@c8a8c0ef feat(plugin): make Plugin extend Namespaced (#12867)
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 17d519244b0d08829e28e9047134b8bee9cde81f..7fb60f68ffb5e8d880d3c8395f64585461d7f5c9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1454,6 +1454,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
|