From b727bda1b0c3c356ff6e7dcd3d095fa859e9f4de Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 27 Jan 2023 12:52:04 -0800 Subject: [PATCH] Updated Upstream (CraftBukkit/Spigot) (#8815) 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: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything --- ...keLighting-call-to-World-spigot-stri.patch | 19 ------------------- work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch deleted file mode 100644 index 684bdb85d5..0000000000 --- a/patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sun, 26 Jul 2020 12:11:39 +0100 -Subject: [PATCH] Add missing strikeLighting call to - World#spigot()#strikeLightningEffect - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World { - lightning.moveTo( loc.getX(), loc.getY(), loc.getZ() ); - lightning.visualOnly = true; - lightning.isSilent = isSilent; -+ world.strikeLightning( lightning ); - return (LightningStrike) lightning.getBukkitEntity(); - } - }; diff --git a/work/CraftBukkit b/work/CraftBukkit index 4768df7366..ab8ace6857 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 4768df7366ef10e808b31e8b167b21913822f076 +Subproject commit ab8ace68577ab6c0eb2f84b19bbf1adf3ad4a01d diff --git a/work/Spigot b/work/Spigot index d90018e043..19641c7577 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit d90018e043c1bdf8dd894701e61927c4f1a8b064 +Subproject commit 19641c7577eefd3f47df12167c5e01f449bce47c