From 0437aeebb7e6094bffe72e18f399f88255f013f0 Mon Sep 17 00:00:00 2001 From: Aurora <21148213+aurorasmiles@users.noreply.github.com> Date: Mon, 7 Jun 2021 13:47:53 +0200 Subject: [PATCH] Updated Upstream (CraftBukkit) (#5784) 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: 3797d93e3 SPIGOT-6492: PortalCreateEvent#getBlocks() returns not all blocks by reason fire --- .../PortalCreateEvent-needs-to-know-its-entity.patch | 9 +++++---- work/CraftBukkit | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch index 9e0087b2d4..a94046cbb6 100644 --- a/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch +++ b/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch @@ -124,11 +124,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // Copy below for loop @@ -0,0 +0,0 @@ public class BlockPortalShape { - blocks.add(state); + BlockPosition.a(this.position, this.position.shift(EnumDirection.UP, this.height - 1).shift(this.d, this.width - 1)).forEach((blockposition) -> { + blocks.setTypeAndData(blockposition, iblockdata, 18); }); - -- PortalCreateEvent event = new PortalCreateEvent(blocks, bworld, null, PortalCreateEvent.CreateReason.FIRE); -+ PortalCreateEvent event = new PortalCreateEvent(blocks, bworld, itemActionContext == null || itemActionContext.getEntity() == null ? null : itemActionContext.getEntity().getBukkitEntity(), PortalCreateEvent.CreateReason.FIRE); // Paper - pass entity param +- +- PortalCreateEvent event = new PortalCreateEvent((java.util.List) (java.util.List) blocks.getList(), bworld, null, PortalCreateEvent.CreateReason.FIRE); ++ PortalCreateEvent event = new PortalCreateEvent((java.util.List) (java.util.List) blocks.getList(), bworld, itemActionContext == null || itemActionContext.getEntity() == null ? null : itemActionContext.getEntity().getBukkitEntity(), PortalCreateEvent.CreateReason.FIRE); // Paper - pass entity param this.b.getMinecraftWorld().getMinecraftServer().server.getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/work/CraftBukkit b/work/CraftBukkit index ebe18b9b0e..3797d93e36 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ebe18b9b0ea94fcec32accc5132d33fe43923455 +Subproject commit 3797d93e369645c9b2d9ab0188aa893a11280628