From 7cbd4ca191d5abd67e7e02de21c0236a6a21abd1 Mon Sep 17 00:00:00 2001 From: Prof-Bloodstone <46570876+Prof-Bloodstone@users.noreply.github.com> Date: Sat, 9 Jan 2021 12:28:28 +0100 Subject: [PATCH] Remove patch for not searching for portal creation when looking down (#5031) Previous commit 97b2eadf1 pulled upstream change that implements the exact same fix. CB change: https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/7029c0a8f3e2a233c889ef3c558aa0f75c29bc5a Co-authored-by: Professor Bloodstone --- ...nfigurable-door-breaking-difficulty.patch} | 0 ...or-portal-creation-when-looking-down.patch | 23 ------------------- ...ty-commands-shall-not-be-dispatched.patch} | 0 ...I-to-expose-exact-interaction-point.patch} | 0 4 files changed, 23 deletions(-) rename Spigot-Server-Patches/{0646-Configurable-door-breaking-difficulty.patch => 0645-Configurable-door-breaking-difficulty.patch} (100%) delete mode 100644 Spigot-Server-Patches/0645-don-t-search-for-portal-creation-when-looking-down.patch rename Spigot-Server-Patches/{0647-Empty-commands-shall-not-be-dispatched.patch => 0646-Empty-commands-shall-not-be-dispatched.patch} (100%) rename Spigot-Server-Patches/{0648-Implement-API-to-expose-exact-interaction-point.patch => 0647-Implement-API-to-expose-exact-interaction-point.patch} (100%) diff --git a/Spigot-Server-Patches/0646-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0645-Configurable-door-breaking-difficulty.patch similarity index 100% rename from Spigot-Server-Patches/0646-Configurable-door-breaking-difficulty.patch rename to Spigot-Server-Patches/0645-Configurable-door-breaking-difficulty.patch 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 deleted file mode 100644 index 335687c596..0000000000 --- a/Spigot-Server-Patches/0645-don-t-search-for-portal-creation-when-looking-down.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: lukas81298 -Date: Tue, 5 Jan 2021 14:53:42 +0100 -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 9c42b5df5839ed1759391270bcc6f240388ddd04..392d27916b929881ff05f94325184acc6f0d7b7a 100644 ---- a/src/main/java/net/minecraft/server/BlockFireAbstract.java -+++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java -@@ -115,7 +115,11 @@ public abstract class BlockFireAbstract extends Block { - break; - } - } -- -+ // Paper start - don't search for portal creation when looking down -+ if(enumdirection == EnumDirection.DOWN || enumdirection == EnumDirection.UP) { -+ return false; -+ } -+ // Paper end - return flag && BlockPortalShape.a((GeneratorAccess) world, blockposition, enumdirection.h().n()).isPresent(); - } - } diff --git a/Spigot-Server-Patches/0647-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0646-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from Spigot-Server-Patches/0647-Empty-commands-shall-not-be-dispatched.patch rename to Spigot-Server-Patches/0646-Empty-commands-shall-not-be-dispatched.patch diff --git a/Spigot-Server-Patches/0648-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0647-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from Spigot-Server-Patches/0648-Implement-API-to-expose-exact-interaction-point.patch rename to Spigot-Server-Patches/0647-Implement-API-to-expose-exact-interaction-point.patch