From 9d6e7e3df02fb98c31bdc1d68afbdffdf7a9d70e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 28 Apr 2024 17:25:31 +0200
Subject: [PATCH] Don't hard fail on plugin remap error Closes #10474

---
 patches/server/0020-Plugin-remapping.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch
index e2804ec264..7f868edfd0 100644
--- a/patches/server/0020-Plugin-remapping.patch
+++ b/patches/server/0020-Plugin-remapping.patch
@@ -347,10 +347,10 @@ index 0000000000000000000000000000000000000000..3a5bb5d2a45654385ca0bc15c81ef953
 +}
 diff --git a/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..06dbaf0c77333f4d0d8ac462edd52097237505c0
+index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f93974d1bd
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java
-@@ -0,0 +1,370 @@
+@@ -0,0 +1,371 @@
 +package io.papermc.paper.pluginremap;
 +
 +import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -701,7 +701,8 @@ index 0000000000000000000000000000000000000000..06dbaf0c77333f4d0d8ac462edd52097
 +        try {
 +            collector.throwIfPresent();
 +        } catch (final Exception ex) {
-+            throw new RuntimeException("Encountered exception remapping plugins", ex);
++            // Don't hard fail during bootstrap/plugin loading. The plugin(s) in question will be skipped
++            LOGGER.error("Encountered exception remapping plugins", ex);
 +        }
 +        return ret;
 +    }