From 5c65546f5cbd6b1d71d85ae39cd30ed2a3c36a6e Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 10 Aug 2021 21:40:03 -0700 Subject: [PATCH] rebase --- patches/server/0739-Add-PlayerSetSpawnEvent.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0739-Add-PlayerSetSpawnEvent.patch b/patches/server/0739-Add-PlayerSetSpawnEvent.patch index 6cd9b4bc53..e32a2be5f1 100644 --- a/patches/server/0739-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0739-Add-PlayerSetSpawnEvent.patch @@ -93,10 +93,10 @@ index af4eb4a8814491afef449a2874521636957d7557..0a5d563700c9f806139001181f01fa9d return InteractionResult.SUCCESS; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9e8918d03b8213e5f6689fc93030138fd704aca9..3971fed7a0d1399117366a5d7dd2e84adbfda55a 100644 +index 0587ef4783228f4e4e7f441a47453bb8c91d7f26..63aa742c505e14faa9bf5df29a8f759486fac80b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1070,9 +1070,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1075,9 +1075,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setBedSpawnLocation(Location location, boolean override) { if (location == null) {