diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index 19a42c08b..bac0b9665 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -76,6 +76,8 @@ public class VersionConstants implements IVersionConstants return "1.21.5"; #elif MC_VER == MC_1_21_6 return "1.21.6"; + #elif MC_VER == MC_1_21_7 + return "1.21.7"; #else ERROR MC version constant missing #endif diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java index 456711821..a6c3abd5d 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java @@ -5,11 +5,14 @@ import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper; import com.seibel.distanthorizons.common.AbstractPluginPacketSender; import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerPlayer; import net.neoforged.neoforge.network.PacketDistributor; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import net.neoforged.neoforge.network.registration.PayloadRegistrar; +import java.util.Objects; import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -41,7 +44,12 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender @Override public void sendToServer(AbstractNetworkMessage message) - { PacketDistributor.sendToServer(new CommonPacketPayload(message)); } + { + if (Minecraft.getInstance().getConnection() != null) + { + Minecraft.getInstance().getConnection().send(new CommonPacketPayload(message)); + } + } @Override public void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message)