mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't hard fail on plugin remap error

Browse source 
Closes #10474
This commit is contained in:
Nassim Jahnke 2024-04-28 17:25:31 +02:00
parent c4a1cd137a
commit 9d6e7e3df0
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
patches/server/0020-Plugin-remapping.patch
View file

@ -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 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 new file mode 100644
index 0000000000000000000000000000000000000000..06dbaf0c77333f4d0d8ac462edd52097237505c0 index 0000000000000000000000000000000000000000..6f1e4ae352dcc6aacd9703b1653701f93974d1bd
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java +++ b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java
@@ -0,0 +1,370 @@ @@ -0,0 +1,371 @@
+package io.papermc.paper.pluginremap; +package io.papermc.paper.pluginremap;
+ +
+import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -701,7 +701,8 @@ index 0000000000000000000000000000000000000000..06dbaf0c77333f4d0d8ac462edd52097
+ try { + try {
+ collector.throwIfPresent(); + collector.throwIfPresent();
+ } catch (final Exception ex) { + } 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; + return ret;
+ } + }