minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Note Spigot requirement

Browse Source
This commit is contained in:
Jikoo
2022-05-12 12:18:18 -04:00
parent f21019eba8
commit ac00261afb
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugin/src/main/java/com/lishid/openinv/OpenInv.java
View File

@@ -112,6 +112,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
private InternalAccessor accessor;
private LanguageManager languageManager;
private boolean isSpigot = false;
/**
* Evicts all viewers lacking cross-world permissions from a Player's inventory.
@@ -355,8 +356,16 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
this.languageManager = new LanguageManager(this, "en_us");
try {
Class.forName("org.bukkit.entity.Player$Spigot");
isSpigot = true;
} catch (ClassNotFoundException e) {
e.printStackTrace();
isSpigot = false;
}
// Version check
if (this.accessor.isSupported()) {
if (isSpigot && this.accessor.isSupported()) {
// Update existing configuration. May require internal access.
new ConfigUpdater(this).checkForUpdates();
@@ -379,8 +388,16 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
}
private void sendVersionError(Consumer<String> messageMethod) {
messageMethod.accept("Your server version (" + this.accessor.getVersion() + ") is not supported.");
messageMethod.accept("Please obtain an appropriate version here: " + accessor.getReleasesLink());
if (!this.accessor.isSupported()) {
messageMethod.accept("Your server version (" + this.accessor.getVersion() + ") is not supported.");
messageMethod.accept("Please obtain an appropriate version here: " + this.accessor.getReleasesLink());
}
if (!isSpigot) {
messageMethod.accept("OpenInv requires that you use Spigot or a Spigot fork. Per the 1.14 update thread");
messageMethod.accept("(https://www.spigotmc.org/threads/369724/ \"A Note on CraftBukkit\"), if you are");
messageMethod.accept("encountering an inconsistency with vanilla that prevents you from using Spigot,");
messageMethod.accept("that is considered a Spigot bug and should be reported as such.");
}
}
private void setCommandExecutor(CommandExecutor executor, String... commands) {
@@ -394,7 +411,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (!this.accessor.isSupported()) {
if (!isSpigot || !this.accessor.isSupported()) {
this.sendVersionError(sender::sendMessage);
return true;
}