Skip to content

Commit 12a6b17

Browse files
committed
fix: send block entity data along with its payload
1 parent bacafef commit 12a6b17

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/java/dev/galacticraft/machinelib/api/block/entity/BaseBlockEntity.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
2828
import net.minecraft.core.BlockPos;
2929
import net.minecraft.network.chat.Component;
30+
import net.minecraft.network.protocol.BundlePacket;
3031
import net.minecraft.network.protocol.Packet;
3132
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
3233
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
3334
import net.minecraft.network.protocol.game.ClientGamePacketListener;
35+
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
36+
import net.minecraft.network.protocol.game.ClientboundBundlePacket;
3437
import net.minecraft.server.level.ServerLevel;
3538
import net.minecraft.server.level.ServerPlayer;
3639
import net.minecraft.util.profiling.ProfilerFiller;
@@ -43,6 +46,8 @@
4346
import org.jetbrains.annotations.NotNull;
4447
import org.jetbrains.annotations.Nullable;
4548

49+
import java.util.List;
50+
4651
/**
4752
* A block entity with additional synchronization utilities.
4853
*
@@ -85,9 +90,7 @@ public BlockPos getScreenOpeningData(ServerPlayer player) {
8590
public final @Nullable Packet<ClientGamePacketListener> getUpdatePacket() {
8691
CustomPacketPayload payload = this.createUpdatePayload();
8792

88-
// safe cast because the ClientCommonPacketListener is a superclass of ClientGamePacketListener
89-
// noinspection unchecked, rawtypes
90-
return payload == null ? null : (Packet) new ClientboundCustomPayloadPacket(payload);
93+
return payload == null ? null : new ClientboundBundlePacket(List.of(ClientboundBlockEntityDataPacket.create(this), new ClientboundCustomPayloadPacket(payload)));
9194
}
9295

9396
/**

0 commit comments

Comments
 (0)