diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java index e1cdde613..5373cac5a 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java @@ -161,11 +161,11 @@ public class BukkitNetworkManager implements NetworkManager, Listener { @EventHandler public void onPlayerRegisterChannel(PlayerRegisterChannelEvent event) { + if (!event.getChannel().equals("craftengine:payload")) return; Player player = event.getPlayer(); NetWorkUser user = getUser(player); - if (user != null) { - user.setUsingClientMod(true); - } + if (user == null) return; + user.setUsingClientMod(true); } @Override diff --git a/client-mod/build.gradle.kts b/client-mod/build.gradle.kts index 54a451fee..9f6bcae72 100644 --- a/client-mod/build.gradle.kts +++ b/client-mod/build.gradle.kts @@ -19,6 +19,8 @@ sourceSets { runtimeClasspath += sourceSets.main.get().runtimeClasspath } main { + compileClasspath += sourceSets["client"].output + runtimeClasspath += sourceSets["client"].output output.dir(sourceSets["client"].output) } } diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java b/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java index 284859cbf..ecb969783 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java +++ b/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java @@ -13,7 +13,7 @@ public class BlockUtils { if (world != null && pos != null) { return BiomeColors.getFoliageColor(world, pos); } - return FoliageColors.DEFAULT; // 默认颜色 + return FoliageColors.DEFAULT; }, block ); diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java b/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java index 9d9f5f079..79ee25203 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java +++ b/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java @@ -2,7 +2,6 @@ package net.momirealms.craftEngineFabricMod.util; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey;