275173e538
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 Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
26 Zeilen
1.3 KiB
Diff
26 Zeilen
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Mon, 3 Apr 2023 21:14:19 -0700
|
|
Subject: [PATCH] Fix destroying beehive without any players nearby throwing an
|
|
exception
|
|
|
|
If the player moves out of range by the time the block is destroyed,
|
|
then the exception would throw and remove the player from the world
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
|
|
index 01c8394c6e6b65f40db04280458d0191c116b845..8b715a750a0406d1d7b25c2f023dc2fb4d8b70fa 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
|
|
@@ -98,6 +98,11 @@ public class BeehiveBlock extends BaseEntityBlock {
|
|
|
|
if (!list.isEmpty()) {
|
|
List<Player> list1 = world.getEntitiesOfClass(Player.class, (new AABB(pos)).inflate(8.0D, 6.0D, 8.0D));
|
|
+ // Paper start - if there are no players nearby, then nextInt() will throw
|
|
+ if (list1.isEmpty()) {
|
|
+ return;
|
|
+ }
|
|
+ // Paper end - if there are no players nearby, then nextInt() will throw
|
|
int i = list1.size();
|
|
Iterator iterator = list.iterator();
|
|
|