Skip to content

Fix startup crash if NetherPortals not installed #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
Jul 23, 2026
Merged

Fix startup crash if NetherPortals not installed #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions src/main/java/org/mvplugins/multiverse/signportals/MultiverseSignPortals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.mvplugins.multiverse.signportals;

import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.mvplugins.multiverse.core.config.CoreConfig;
import org.mvplugins.multiverse.core.module.MultiverseModule;
Expand All @@ -17,8 +16,6 @@
import org.jvnet.hk2.annotations.Service;
import org.mvplugins.multiverse.external.jakarta.inject.Inject;
import org.mvplugins.multiverse.external.jakarta.inject.Provider;
import org.mvplugins.multiverse.external.vavr.control.Try;
import org.mvplugins.multiverse.netherportals.MultiverseNetherPortalsApi;
import org.mvplugins.multiverse.signportals.listeners.SignPortalsListener;
import org.mvplugins.multiverse.signportals.utils.PortalDetector;

Expand All @@ -44,27 +41,15 @@ public void onEnable() {
initializeDependencyInjection(new MultiverseSignPortalsPluginBinder(this));
Logging.setDebugLevel(serviceLocator.getActiveService(CoreConfig.class).getGlobalDebug());
registerDynamicListeners(SignPortalsListener.class);
registerNetherPortalsHandleCheck();

if (ReflectHelper.hasClass("org.mvplugins.multiverse.netherportals.MultiverseNetherPortalsApi")) {
NetherPortalsCompatibilty.registerNetherPortalsHandleCheck(portalDetectorProvider.get());
}

Logging.config("Version %s (API v%s) Enabled - By %s",
this.getDescription().getVersion(), getVersionAsNumber(), StringFormatter.joinAnd(this.getDescription().getAuthors()));
}

private void registerNetherPortalsHandleCheck() {
if (!ReflectHelper.hasClass("org.mvplugins.multiverse.netherportals.MultiverseNetherPortalsApi")) {
return;
}
MultiverseNetherPortalsApi.whenLoaded(api ->
api.getCustomPortalsHandler().registerHandleCheck(((entity, portalLocation) -> {
if (!(entity instanceof Player player)) {
return false;
}
Logging.finer("Checking if player %s can use NetherPortals at %s", player.getName(), portalLocation);
return Try.of(() -> portalDetectorProvider.get().getNotchPortalDestination(player, portalLocation) != null)
.getOrElse(false);
})));
}

@Override
public void onDisable() {
shutdownDependencyInjection();
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/org/mvplugins/multiverse/signportals/NetherPortalsCompatibilty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.mvplugins.multiverse.signportals;

import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.entity.Player;
import org.mvplugins.multiverse.external.vavr.control.Try;
import org.mvplugins.multiverse.netherportals.MultiverseNetherPortalsApi;
import org.mvplugins.multiverse.signportals.utils.PortalDetector;

final class NetherPortalsCompatibilty {

Check warning on line 9 in src/main/java/org/mvplugins/multiverse/signportals/NetherPortalsCompatibilty.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add a private constructor to hide the implicit public one. 


See more on https://sonarcloud.io/project/issues?id=Multiverse_Multiverse-SignPortals&issues=AZ-PH_1bs2nL8M0gamTg&open=AZ-PH_1bs2nL8M0gamTg&pullRequest=113

static void registerNetherPortalsHandleCheck(PortalDetector pd) {
MultiverseNetherPortalsApi.whenLoaded(api -> {
api.getCustomPortalsHandler().registerHandleCheck(((entity, portalLocation) -> {
if (!(entity instanceof Player player)) {
return false;
}
Logging.finer("Checking if player %s can use NetherPortals at %s",
player.getName(), portalLocation);
return Try.of(() -> pd.getNotchPortalDestination(player, portalLocation) != null)
.getOrElse(false);
}));
Logging.finer("Registered NetherPortals handle check with SignPortals.");
});
}
}
Loading