From ac7f94e4cf81e16aecf2b3319314192bcf6a5668 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 9 Nov 2022 16:05:46 -0800 Subject: [PATCH] Updated Upstream (CraftBukkit) (#8548) --- ...CreateEvent-players-and-end-platform.patch | 33 ------------------- work/CraftBukkit | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 patches/server/call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/call-PortalCreateEvent-players-and-end-platform.patch deleted file mode 100644 index 6c3038b29e..0000000000 --- a/patches/server/call-PortalCreateEvent-players-and-end-platform.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Wed, 12 May 2021 03:21:22 -0700 -Subject: [PATCH] call PortalCreateEvent players and end platform - - -diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java -+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -0,0 +0,0 @@ public class ServerPlayer extends Player { - private void createEndPlatform(ServerLevel world, BlockPos centerPos) { - BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable(); - -+ org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(world); // Paper - for (int i = -2; i <= 2; ++i) { - for (int j = -2; j <= 2; ++j) { - for (int k = -1; k < 3; ++k) { - BlockState iblockdata = k == -1 ? Blocks.OBSIDIAN.defaultBlockState() : Blocks.AIR.defaultBlockState(); - -- world.setBlockAndUpdate(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata); -+ blockList.setBlock(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata, 3); // Paper - } - } - } -+ // Paper start -+ if (new org.bukkit.event.world.PortalCreateEvent((List< org.bukkit.block.BlockState>) (List) blockList.getList(), world.getWorld(), this.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM).callEvent()) { -+ blockList.updateList(); -+ } -+ // Paper end - - } - diff --git a/work/CraftBukkit b/work/CraftBukkit index f43634ae43..300e7448f5 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f43634ae431d1ba7ee959627ee295417fe08b067 +Subproject commit 300e7448f5f0466e23b97d69aa424629c816fc8e