dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug where the container slots weren't synced when opening a Grid. Fixes #2200

Browse Source
This commit is contained in:
raoulvdberge
2019-07-21 16:30:34 +02:00
parent c05b6ec04f
commit 22c91fe8f9
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java
View File

@@ -61,13 +61,25 @@ public class GridManager implements IGridManager {
player.getNextWindowId();
player.closeContainer();
// The order of sending this packet and setting openContainer matters!
// We first need to send the grid open packet with the window id.
// Then we set the openContainer so the slots are getting sent (EntityPlayerMP::update -> Container::detectAndSendChanges).
// If the client window id mismatches with the server window id this causes problems with slots not being set.
// If we would set the openContainer first, the slot packets would be sent first but wouldn't be able to be set
// on the client since the window id would mismatch.
// So we first send the window id in MessageGridOpen.
// The order is preserved by TCP.
RS.INSTANCE.network.sendTo(new MessageGridOpen(player.currentWindowId, pos, id, stack), player);
player.openContainer = new ContainerGrid(grid.getLeft(), new ResizableDisplayDummy(), grid.getRight() instanceof TileBase ? (TileBase) grid.getRight() : null, player);
player.openContainer.windowId = player.currentWindowId;
player.openContainer.addListener(player);
MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, player.openContainer));
RS.INSTANCE.network.sendTo(new MessageGridOpen(player.currentWindowId, pos, id, stack), player);
}
@Override