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

Null check player channel

Browse Source
This commit is contained in:
Camotoy
2021-05-07 15:02:58 -04:00
parent f0b292cdc8
commit 84ddb0e59e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/geysermc/floodgate/util/FabricCommandUtil.java
View File

@@ -2,6 +2,7 @@ package org.geysermc.floodgate.util;
import com.mojang.authlib.GameProfile;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import io.netty.channel.Channel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.kyori.adventure.platform.fabric.FabricServerAudiences;
@@ -13,7 +14,6 @@ import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.platform.command.CommandMessage;
@@ -69,7 +69,13 @@ public final class FabricCommandUtil implements CommandUtil {
private FabricUserAudience getAudience0(ServerPlayerEntity player) {
// Marked as internal??? Should probably find a better way to get this.
Locale locale = ((ConnectionAccess) player.networkHandler.getConnection()).getChannel().attr(FriendlyByteBufBridge.CHANNEL_LOCALE).get();
Locale locale;
Channel channel = ((ConnectionAccess) player.networkHandler.getConnection()).getChannel();
if (channel != null) {
locale = channel.attr(FriendlyByteBufBridge.CHANNEL_LOCALE).get();
} else {
locale = null;
}
return new FabricUserAudience.NamedFabricUserAudience(
player.getName().asString(),
player.getUuid(), locale != null ?