diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/command/BotCommand.java b/src/main/java/com/github/zly2006/carpetslsaddition/command/BotCommand.java index cee0473..886e14c 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/command/BotCommand.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/command/BotCommand.java @@ -18,6 +18,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import me.lucko.fabric.api.permissions.v0.Permissions; +import net.minecraft.SharedConstants; import net.minecraft.command.argument.DimensionArgumentType; import net.minecraft.command.argument.GameModeArgumentType; import net.minecraft.command.argument.RotationArgumentType; @@ -376,7 +377,7 @@ public class BotCommand { private static int maxNameLength(MinecraftServer server) { - return 16; + return server.getServerPort() >= 0 ? SharedConstants.field_49170 : 40; } private static int manipulate(CommandContext context, Consumer action) diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java index b78dfea..55cb9c7 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java @@ -3,9 +3,7 @@ package com.github.zly2006.carpetslsaddition.mixin.entity; import com.github.zly2006.carpetslsaddition.util.access.PlayerAccess; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; - import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -13,8 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(PlayerEntity.class) public abstract class MixinPlayerEntity implements PlayerAccess { - @Shadow public abstract Text getName(); - @Unique private Text displayName = null;