mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-06 15:51:31 +00:00
52477a91ae
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f4f27551 [ci/skip] Clarify BlockFadeEvent#getNewState javadocs (#12250) PaperMC/Paper@102c8bbc Add config for updating equipment on player actions (#12275) PaperMC/Paper@f0388e2f Call EntityPushedByEntityAttackEvent for Mace AoE (#12257) PaperMC/Paper@c37b890c More deferred requireNonNull message creation PaperMC/Paper@310f5229 Add unsupported config option and internal API to simplify remote item matching PaperMC/Paper@6ea42025 Send all attributes on respawn (#12274) PaperMC/Paper@2d3a1385 [ci/skip] Refine recipe management API documentation. (#12287) PaperMC/Paper@aaaeb4e1 [ci/skip] Make compilation logs actually readable (#12276) PaperMC/Paper@bb1beda6 feat: add event to wind charge explode (#12248) Gale Changes: Dreeam-qwq/Gale@43bfa513 Updated Upstream (Paper) Dreeam-qwq/Gale@ab0a7189 Updated Upstream () Dreeam-qwq/Gale@27ddb2fa [ci/skip] Added merge announcement Dreeam-qwq/Gale@523e7745 [ci/skip] Fix announcement format Dreeam-qwq/Gale@d91ed070 [ci/skip] Update annocement
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 d910faa326612a7272ca3204d436ee7781504645..7790ebbdfcce35eff8d1423127fc408a52c54f9d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1386,6 +1386,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
|