Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Networking fix #172

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ private NbtCompound takeEntitySnapshot() {

return entitySnapshot;
}

@Override
protected int getNextAirUnderwater(int air) {
return air;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,4 @@ public static <T extends Packet<T>> void sendToServer(Identifier channel, T pack
public static <T extends Packet<T>> void sendToPlayer(Identifier channel, T packet, PlayerEntity player) {
throw new NotImplementedException();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import net.minecraft.world.dimension.DimensionTypes;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.event.AddReloadListenerEvent;
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.event.OnDatapackSyncEvent;
import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
import net.minecraftforge.event.level.LevelEvent;
Expand Down Expand Up @@ -140,10 +140,12 @@ private static void onSetup(FMLCommonSetupEvent event) {
}

private static void onDatapackSync(OnDatapackSyncEvent event) {
if (event.getPlayer() != null) {
DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(event.getPlayer()));
} else {
event.getPlayerList().getPlayerList().forEach(player -> DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(player)));
if (FMLEnvironment.dist.isDedicatedServer()) {
if (event.getPlayer() != null) {
DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(event.getPlayer()));
} else {
event.getPlayerList().getPlayerList().forEach(player -> DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(player)));
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,18 @@ public static <T extends Packet<T>> void registerS2CPacket(
}
channel.channel.registerMessage(++channel.packets, packetClass, handler::encode, handler::decode, (msg, ctx) -> {
NetworkEvent.Context context = ctx.get();
PlayerEntity player = null;
if (context.getSender() == null) {
player = PlayerProvider.getClientPlayer();
}
context.enqueueWork(() -> {
PlayerEntity player = null;
if (context.getSender() == null) {
player = PlayerProvider.getClientPlayer();
}

if (player != null) {
PlayerEntity finalPlayer = player;
handler.handle(msg).apply(finalPlayer, finalPlayer.getWorld());
}
});

if (player != null) {
PlayerEntity finalPlayer = player;
context.enqueueWork(() -> handler.handle(msg).apply(finalPlayer, finalPlayer.getWorld()));
}
context.setPacketHandled(true);
});
}
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ logoFile = "icon.png"
[[dependencies.${ modId }]]
modId = "forge"
mandatory = true
versionRange="[${forgeVersion},)"
versionRange = "[${forgeVersion},)"

[[dependencies.${ modId }]]
modId = "minecraft"
Expand Down
Loading