mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
25 lines
1.3 KiB
Diff
25 lines
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 ca6cf92b96d68ba8b34e90edda2a93e11214c91b..d5dd280fbbd87438c72d439a73ea827b9fbe20b0 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();
|
|
|