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

Fixed bugs

Browse Source
This commit is contained in:
Auxilor
2021-09-04 11:03:04 +01:00
parent cb4d992e7d
commit 415c425097
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,6 +309,23 @@ public abstract class EcoPlugin extends JavaPlugin {
this.configYml = this.createConfigYml();
Eco.getHandler().addNewPlugin(this);
/*
The minimum eco version check was moved here because it's very common
to add a lot of code in the constructor of plugins; meaning that the plugin
can throw errors without it being obvious to the user that the reason is
because they have an outdated version of eco installed.
*/
DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.getHandler().getEcoPlugin().getDescription().getVersion());
DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(this.getMinimumEcoVersion());
if (!(runningVersion.compareTo(requiredVersion) > 0 || runningVersion.equals(requiredVersion))) {
this.getLogger().severe("You are running an outdated version of eco!");
this.getLogger().severe("You must be on at least" + this.getMinimumEcoVersion());
this.getLogger().severe("Download the newest version here:");
this.getLogger().severe("https://polymart.org/download/773/recent/JSpprMspkuyecf5y1wQ2Jn8OoLQSQ_IW");
Bukkit.getPluginManager().disablePlugin(this);
}
}
/**
@@ -336,16 +353,6 @@ public abstract class EcoPlugin extends JavaPlugin {
});
}
DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.getHandler().getEcoPlugin().getDescription().getVersion());
DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(this.getMinimumEcoVersion());
if (!(runningVersion.compareTo(requiredVersion) > 0 || runningVersion.equals(requiredVersion))) {
this.getLogger().severe("You are running an outdated version of eco!");
this.getLogger().severe("You must be on at least" + this.getMinimumEcoVersion());
this.getLogger().severe("Download the newest version here:");
this.getLogger().severe("https://polymart.org/download/773/recent/JSpprMspkuyecf5y1wQ2Jn8OoLQSQ_IW");
Bukkit.getPluginManager().disablePlugin(this);
}
if (this.getBStatsId() != 0) {
Eco.getHandler().registerBStats(this);
}

3
eco-api/src/main/java/com/willfp/eco/core/Handler.java
View File

@@ -16,6 +16,7 @@ import com.willfp.eco.core.proxy.ProxyFactory;
import com.willfp.eco.core.scheduling.Scheduler;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.logging.Logger;
@@ -167,7 +168,7 @@ public interface Handler {
* @param name The name.
* @return The plugin.
*/
@NotNull
@Nullable
EcoPlugin getPluginByName(@NotNull String name);
/**

5
eco-api/src/main/java/com/willfp/eco/util/ListUtils.java
View File

@@ -2,6 +2,7 @@ package com.willfp.eco.util;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -20,8 +21,8 @@ public class ListUtils {
* @return The list, filled will null objects.
*/
@NotNull
public <@NotNull T> List<List<T>> create2DList(final int rows,
final int columns) {
public <@Nullable T> List<List<T>> create2DList(final int rows,
final int columns) {
List<List<T>> list = new ArrayList<>(rows);
while (list.size() < rows) {
List<T> row = new ArrayList<>(columns);