Fix startup issue with potion providers (#6055)

JRoy · web-flow · commit 196a2a19c424 · 2025-02-19T15:58:00.000-05:00
The LegacyPotionMetaProvider was initializing a map with enums that don't exist on modern versions. Since this was a static variable, this map got initialized when the test method was called, leading to a NoSuchFieldError. Also improved resilience of these provider-type issues again by catching a Throwable rather than an Exception in the ProviderFactory. Fixes #6054
diff --git a/Essentials/src/main/java/com/earth2me/essentials/ProviderFactory.java b/Essentials/src/main/java/com/earth2me/essentials/ProviderFactory.java
@@ -68,7 +68,7 @@ public void finalizeRegistration() {
                         highestProvider = provider;
                         highestProviderData = providerData;
                     }
-                } catch (final Exception e) {
+                } catch (final Throwable e) {
                     essentials.getLogger().log(Level.SEVERE, "Failed to initialize provider " + provider.getName(), e);
                 }
             }
diff --git a/providers/1_12Provider/src/main/java/net/ess3/provider/providers/LegacyPotionMetaProvider.java b/providers/1_12Provider/src/main/java/net/ess3/provider/providers/LegacyPotionMetaProvider.java
@@ -16,7 +16,7 @@
 
 @ProviderData(description = "1.9-1.20.4 Potion Meta Provider", weight = 1)
 public class LegacyPotionMetaProvider implements PotionMetaProvider {
-    private static final Map<Integer, PotionType> damageValueToType = ImmutableMap.<Integer, PotionType>builder()
+    private final Map<Integer, PotionType> damageValueToType = ImmutableMap.<Integer, PotionType>builder()
         .put(1, PotionType.REGEN)
         .put(2, PotionType.SPEED)
         .put(3, PotionType.FIRE_RESISTANCE)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void finalizeRegistration() {`
`68`	`68`	`highestProvider = provider;`
`69`	`69`	`highestProviderData = providerData;`
`70`	`70`	`}`
`71`		`- } catch (final Exception e) {`
	`71`	`+ } catch (final Throwable e) {`
`72`	`72`	`essentials.getLogger().log(Level.SEVERE, "Failed to initialize provider " + provider.getName(), e);`
`73`	`73`	`}`
`74`	`74`	`}`