From 97b2eadf17ff7f83e17f223de1b845ca6b291c62 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 8 Jan 2021 22:07:02 -0500 Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 7029c0a8f SPIGOT-6311: Don't calculate portal shapes for up/down directions --- ...5-don-t-search-for-portal-creation-when-looking-down.patch | 4 ++-- work/CraftBukkit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0645-don-t-search-for-portal-creation-when-looking-down.patch b/Spigot-Server-Patches/0645-don-t-search-for-portal-creation-when-looking-down.patch index ca1cad0ce9..335687c596 100644 --- a/Spigot-Server-Patches/0645-don-t-search-for-portal-creation-when-looking-down.patch +++ b/Spigot-Server-Patches/0645-don-t-search-for-portal-creation-when-looking-down.patch @@ -5,10 +5,10 @@ Subject: [PATCH] don't search for portal creation when looking down diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java -index 172e4b3eeecc3808a335b80bb44bc6be3d8dd33d..5727b6f8d94040868ba752ea186b8e8995e189b6 100644 +index 9c42b5df5839ed1759391270bcc6f240388ddd04..392d27916b929881ff05f94325184acc6f0d7b7a 100644 --- a/src/main/java/net/minecraft/server/BlockFireAbstract.java +++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java -@@ -109,7 +109,11 @@ public abstract class BlockFireAbstract extends Block { +@@ -115,7 +115,11 @@ public abstract class BlockFireAbstract extends Block { break; } } diff --git a/work/CraftBukkit b/work/CraftBukkit index ff2b9440f5..7029c0a8f3 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ff2b9440f5442fb2b1e485b28aee201f47c512f2 +Subproject commit 7029c0a8f3e2a233c889ef3c558aa0f75c29bc5a