From 9561a53e7a1232a284c684a3488419ed3f984680 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 11 Mar 2023 12:54:25 -0800
Subject: [PATCH] Log exceptions in ThreadedRegioniser explicitly

I suspect something called these methods, they threw and then
the error was hidden by some completablefuture somewhere.
---
 build-data/dev-imports.txt                 |  2 ++
 patches/server/0004-Threaded-Regions.patch | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt
index b818b96..c473010 100644
--- a/build-data/dev-imports.txt
+++ b/build-data/dev-imports.txt
@@ -8,3 +8,5 @@
 # To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
 #     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
 #     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
+minecraft net.minecraft.world.entity.ai.behavior.PoiCompetitorScan
+minecraft net.minecraft.world.entity.ai.behavior.SetWalkTargetFromBlockMemory
diff --git a/patches/server/0004-Threaded-Regions.patch b/patches/server/0004-Threaded-Regions.patch
index b9a310b..2d4823c 100644
--- a/patches/server/0004-Threaded-Regions.patch
+++ b/patches/server/0004-Threaded-Regions.patch
@@ -6163,14 +6163,16 @@ index 0000000000000000000000000000000000000000..84b4ff07735fb84e28ee8966ffdedb1b
 +}
 diff --git a/src/main/java/io/papermc/paper/threadedregions/ThreadedRegioniser.java b/src/main/java/io/papermc/paper/threadedregions/ThreadedRegioniser.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5c4c65f1579ac170a3274c65dd0c4fa3abab5057
+index 0000000000000000000000000000000000000000..f6e41c466ba2501f82fd7916742c5fc045ddf828
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/threadedregions/ThreadedRegioniser.java
-@@ -0,0 +1,1187 @@
+@@ -0,0 +1,1203 @@
 +package io.papermc.paper.threadedregions;
 +
 +import ca.spottedleaf.concurrentutil.map.SWMRLong2ObjectHashTable;
 +import ca.spottedleaf.concurrentutil.util.ConcurrentUtil;
++import com.destroystokyo.paper.util.SneakyThrow;
++import com.mojang.logging.LogUtils;
 +import io.papermc.paper.util.CoordinateUtils;
 +import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap;
 +import it.unimi.dsi.fastutil.longs.LongArrayList;
@@ -6179,7 +6181,7 @@ index 0000000000000000000000000000000000000000..5c4c65f1579ac170a3274c65dd0c4fa3
 +import net.minecraft.server.level.ServerLevel;
 +import net.minecraft.world.entity.Entity;
 +import net.minecraft.world.level.ChunkPos;
-+
++import org.slf4j.Logger;
 +import java.lang.invoke.VarHandle;
 +import java.util.ArrayList;
 +import java.util.Arrays;
@@ -6192,6 +6194,8 @@ index 0000000000000000000000000000000000000000..5c4c65f1579ac170a3274c65dd0c4fa3
 +
 +public final class ThreadedRegioniser<R extends ThreadedRegioniser.ThreadedRegionData<R, S>, S extends ThreadedRegioniser.ThreadedRegionSectionData> {
 +
++    private static final Logger LOGGER = LogUtils.getLogger();
++
 +    public final int regionSectionChunkSize;
 +    public final int sectionChunkShift;
 +    public final int minSectionRecalcCount;
@@ -6557,6 +6561,10 @@ index 0000000000000000000000000000000000000000..5c4c65f1579ac170a3274c65dd0c4fa3
 +                }
 +                this.callbacks.onRegionActive(regionOfInterest);
 +            }
++        } catch (final Throwable throwable) {
++            LOGGER.error("Failed to add chunk (" + chunkX + "," + chunkZ + ")", throwable);
++            SneakyThrow.sneaky(throwable);
++            return; // unreachable
 +        } finally {
 +            this.releaseWriteLock();
 +        }
@@ -6600,6 +6608,10 @@ index 0000000000000000000000000000000000000000..5c4c65f1579ac170a3274c65dd0c4fa3
 +                    neighbourSection.decrementNonEmptyNeighbours();
 +                }
 +            }
++        } catch (final Throwable throwable) {
++            LOGGER.error("Failed to add chunk (" + chunkX + "," + chunkZ + ")", throwable);
++            SneakyThrow.sneaky(throwable);
++            return; // unreachable
 +        } finally {
 +            this.releaseWriteLock();
 +        }
@@ -7001,6 +7013,10 @@ index 0000000000000000000000000000000000000000..5c4c65f1579ac170a3274c65dd0c4fa3
 +                this.regioniser.onRegionRelease(this);
 +
 +                return this.state == STATE_READY;
++            } catch (final Throwable throwable) {
++                LOGGER.error("Failed to acquire region " + this, throwable);
++                SneakyThrow.sneaky(throwable);
++                return false; // unreachable
 +            } finally {
 +                this.regioniser.releaseWriteLock();
 +            }