Upstream/UltimateTimber
1
0
Fork 0
mirror of https://github.com/songoda/UltimateTimber.git synced 2024-09-27 13:22:39 +02:00
Code Issues Projects Releases Wiki Activity

Fixed McMMO hook not registering properly.

Browse Source
This commit is contained in:
Steven Conley 2020-01-12 18:35:43 -06:00
parent daabc4f70e
commit 60aa7a3157
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java
View File

@ -11,14 +11,13 @@ import com.songoda.ultimatetimber.hook.McMMOHook;
import com.songoda.ultimatetimber.hook.TimberHook; import com.songoda.ultimatetimber.hook.TimberHook;
import com.songoda.ultimatetimber.tree.TreeBlockSet; import com.songoda.ultimatetimber.tree.TreeBlockSet;
import com.songoda.ultimatetimber.utils.NMSUtil; import com.songoda.ultimatetimber.utils.NMSUtil;
import java.util.HashSet;
import java.util.Set;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import java.util.HashSet;
import java.util.Set;
public class HookManager extends Manager { public class HookManager extends Manager {
private Set<TimberHook> hooks; private Set<TimberHook> hooks;
@ -35,23 +34,25 @@ public class HookManager extends Manager {
this.tryHook("Jobs", JobsHook.class); this.tryHook("Jobs", JobsHook.class);
this.tryHook("CoreProtect", CoreProtectHook.class); this.tryHook("CoreProtect", CoreProtectHook.class);
if (this.ultimateTimber.getVersionAdapter().getVersionAdapterType().equals(VersionAdapterType.CURRENT)) { Bukkit.getScheduler().runTaskAsynchronously(this.ultimateTimber, () -> {
Plugin mcMMO = Bukkit.getPluginManager().getPlugin("mcMMO"); if (this.ultimateTimber.getVersionAdapter().getVersionAdapterType().equals(VersionAdapterType.CURRENT)) {
if (mcMMO != null) { Plugin mcMMO = Bukkit.getPluginManager().getPlugin("mcMMO");
String version = mcMMO.getDescription().getVersion(); if (mcMMO != null) {
if (version.startsWith("2")) { String version = mcMMO.getDescription().getVersion();
this.tryHook("mcMMO", McMMOHook.class); if (version.startsWith("2")) {
} else { this.tryHook("mcMMO", McMMOHook.class);
this.tryHook("mcMMO", McMMOClassic13Hook.class); } else {
this.tryHook("mcMMO", McMMOClassic13Hook.class);
}
}
} else {
if (NMSUtil.getVersionNumber() == 12) {
this.tryHook("mcMMO", McMMOClassic12Hook.class);
} else if (NMSUtil.getVersionNumber() == 8) {
this.tryHook("mcMMO", McMMOClassic8Hook.class);
} }
} }
} else { });
if (NMSUtil.getVersionNumber() == 12) {
this.tryHook("mcMMO", McMMOClassic12Hook.class);
} else if (NMSUtil.getVersionNumber() == 8) {
this.tryHook("mcMMO", McMMOClassic8Hook.class);
}
}
} }
@Override @Override