Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
Auxilor
2021-09-13 12:12:33 +01:00
parent cf3c1f8394 5627582bd5
commit f9bc2aba99
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java
View File

@@ -357,15 +357,18 @@ public abstract class EcoPlugin extends JavaPlugin {
Eco.getHandler().registerBStats(this);
}
Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toSet());
Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins())
.map(Plugin::getName)
.map(String::toLowerCase)
.collect(Collectors.toSet());
if (enabledPlugins.contains("PlaceholderAPI")) {
if (enabledPlugins.contains("PlaceholderAPI".toLowerCase())) {
this.loadedIntegrations.add("PlaceholderAPI");
PlaceholderManager.addIntegration(Eco.getHandler().createPAPIIntegration(this));
}
this.loadIntegrationLoaders().forEach((integrationLoader -> {
if (enabledPlugins.contains(integrationLoader.getPluginName())) {
if (enabledPlugins.contains(integrationLoader.getPluginName().toLowerCase())) {
this.loadedIntegrations.add(integrationLoader.getPluginName());
integrationLoader.load();
}

4
eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java
View File

@@ -1,9 +1,11 @@
package com.willfp.eco.core.integrations.shop;
import com.willfp.eco.core.integrations.Integration;
/**
* Wrapper class for shop integrations.
*/
public interface ShopWrapper {
public interface ShopWrapper extends Integration {
/**
* Register eco item provider for shop plugins.
*/