Merge pull request #59 from BONNe/patch-1

Update to BentoBox 1.2
This commit is contained in:
tastybento 2019-01-27 22:54:35 -08:00 committed by GitHub
commit 337c935014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,27 +41,20 @@ public class ChallengesAddon extends Addon {
// Challenge import setup // Challenge import setup
importManager = new FreshSqueezedChallenges(this); importManager = new FreshSqueezedChallenges(this);
// Register commands - run one tick later to allow all addons to load this.getPlugin().getAddonsManager().getGameModeAddons().forEach(gameModeAddon -> {
// AcidIsland hook in if (gameModeAddon.getPlayerCommand().isPresent())
getPlugin().getAddonsManager().getAddonByName("AcidIsland").ifPresent(a -> { {
CompositeCommand acidIslandCmd = getPlugin().getCommandsManager().getCommand("ai"); new ChallengesCommand(this, gameModeAddon.getPlayerCommand().get());
if (acidIslandCmd != null) { this.hooked = true;
new ChallengesCommand(this, acidIslandCmd); }
CompositeCommand acidCmd = getPlugin().getCommandsManager().getCommand("acid");
new Challenges(this, acidCmd); if (gameModeAddon.getAdminCommand().isPresent())
hooked = true; {
} new Challenges(this, gameModeAddon.getAdminCommand().get());
}); this.hooked = true;
getPlugin().getAddonsManager().getAddonByName("BSkyBlock").ifPresent(a -> {
// BSkyBlock hook in
CompositeCommand bsbIslandCmd = getPlugin().getCommandsManager().getCommand("island");
if (bsbIslandCmd != null) {
new ChallengesCommand(this, bsbIslandCmd);
CompositeCommand bsbAdminCmd = getPlugin().getCommandsManager().getCommand("bsbadmin");
new Challenges(this, bsbAdminCmd);
hooked = true;
} }
}); });
// If the add-on never hooks in, then it is useless // If the add-on never hooks in, then it is useless
if (!hooked) { if (!hooked) {
logError("Challenges could not hook into AcidIsland or BSkyBlock so will not do anything!"); logError("Challenges could not hook into AcidIsland or BSkyBlock so will not do anything!");