GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-30 20:29:19 +00:00
Code Issues Releases Activity

Update/fix bootstraps and build

Browse Source
This commit is contained in:
Eclipse
2025-06-17 18:55:55 +00:00
parent 4502762b67
commit c29b20d23a
10 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/PermissionUtils.java
View File

@@ -32,6 +32,8 @@ import org.geysermc.geyser.api.event.lifecycle.GeyserRegisterPermissionsEvent;
import org.geysermc.geyser.api.util.TriState;
import org.geysermc.geyser.platform.neoforge.mixin.PermissionNodeMixin;
import java.util.Objects;
/**
* Common logic for handling the more complicated way we have to register permission on NeoForge
*/
@@ -69,7 +71,7 @@ public class PermissionUtils {
case FALSE -> false;
case NOT_SET -> {
if (player != null) {
yield player.createCommandSourceStack().hasPermission(player.server.getOperatorUserPermissionLevel());
yield player.createCommandSourceStack().hasPermission(Objects.requireNonNull(player.getServer()).getOperatorUserPermissionLevel());
}
yield false; // NeoForge javadocs say player is null in the case of an offline player.
}

4
bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml
View File

@@ -16,12 +16,12 @@ config = "geyser_neoforge.mixins.json"
[[dependencies.geyser_neoforge]]
modId="neoforge"
type="required"
versionRange="[21.5.0-beta,)"
versionRange="[21.6.0-beta,)"
ordering="NONE"
side="BOTH"
[[dependencies.geyser_neoforge]]
modId="minecraft"
type="required"
versionRange="[1.21.5,)"
versionRange="[1.21.6,)"
ordering="NONE"
side="BOTH"