Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-05 07:57:59 +01:00
Code Issues Projects Releases Wiki Activity

fix 1.8 spigot compat

Browse Source
This commit is contained in:
JRoy 2024-12-30 09:15:26 -05:00
parent aad0ee5778
commit a869f09d43
No known key found for this signature in database
GPG Key ID: FAD510B503869E7D
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/main/java/com/earth2me/essentials/ProviderFactory.java
View File

@ -78,18 +78,24 @@ public class ProviderFactory {
providers.put(providerClass, getProviderInstance(highestProvider)); providers.put(providerClass, getProviderInstance(highestProvider));
} else if (!nullable) { } else if (!nullable) {
throw new IllegalStateException("No provider found for " + providerClass.getName()); throw new IllegalStateException("No provider found for " + providerClass.getName());
} else {
essentials.getLogger().info("No provider found for " + providerClass.getSimpleName() + ", but it is nullable");
} }
} }
registeredProviders.clear(); registeredProviders.clear();
} }
private boolean testProvider(final Class<?> providerClass) throws InvocationTargetException, IllegalAccessException { private boolean testProvider(final Class<?> providerClass) throws InvocationTargetException, IllegalAccessException {
for (final Method method : providerClass.getMethods()) { try {
if (method.isAnnotationPresent(ProviderTest.class)) { for (final Method method : providerClass.getMethods()) {
return (Boolean) method.invoke(null); if (method.isAnnotationPresent(ProviderTest.class)) {
return (Boolean) method.invoke(null);
}
} }
return true;
} catch (final NoClassDefFoundError ignored) {
return false;
} }
return true;
} }
private <P extends Provider> P getProviderInstance(final Class<P> provider) { private <P extends Provider> P getProviderInstance(final Class<P> provider) {

2
providers/BaseProviders/src/main/java/net/ess3/provider/MaterialTagProvider.java
View File

@ -1,7 +1,9 @@
package net.ess3.provider; package net.ess3.provider;
import net.essentialsx.providers.NullableProvider;
import org.bukkit.Material; import org.bukkit.Material;
@NullableProvider
public interface MaterialTagProvider extends Provider { public interface MaterialTagProvider extends Provider {
boolean tagExists(String tagName); boolean tagExists(String tagName);