From 442fa3244387def798dd8f77a9a0624164f248d2 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 9 Jan 2021 13:32:26 +0000
Subject: [PATCH] Ensure POI removal occurs on the correct thread

---
 Spigot-Server-Patches/Remove-stale-POIs.patch | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/Remove-stale-POIs.patch b/Spigot-Server-Patches/Remove-stale-POIs.patch
index 94deb927c..bdaea55de 100644
--- a/Spigot-Server-Patches/Remove-stale-POIs.patch
+++ b/Spigot-Server-Patches/Remove-stale-POIs.patch
@@ -33,8 +33,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Optional<VillagePlaceType> optional1 = VillagePlaceType.b(iblockdata1);
  
 +        // Paper start
-+        if (!optional.isPresent() && this.getPoiStorage().test(blockposition, com.google.common.base.Predicates.alwaysTrue()))
-+            this.getPoiStorage().remove(blockposition);
++        this.getMinecraftServer().execute(() -> {
++                if (!optional.isPresent() && this.getPoiStorage().test(blockposition, com.google.common.base.Predicates.alwaysTrue())) {
++                    this.getPoiStorage().remove(blockposition);
++                }
++        });
 +        // Paper end
          if (!Objects.equals(optional, optional1)) {
              BlockPosition blockposition1 = blockposition.immutableCopy();