From f6786d734131bd9e0318cb985a1f3e310ce7cf20 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 6 Sep 2017 15:14:45 +0200 Subject: [PATCH] Fixed wrong tab page when page exceeds max pages --- .../com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java | 2 +- .../refinedstorage/tile/grid/portable/PortableGrid.java | 2 +- .../refinedstorage/tile/grid/portable/TilePortableGrid.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java index 142e25493..2a59bb362 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -132,7 +132,7 @@ public class WirelessGrid implements IGrid { @Override public int getTabPage() { - return tabPage; + return Math.min(tabPage, getTotalTabPages()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java index 200087609..ad0f51ae2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java @@ -238,7 +238,7 @@ public class PortableGrid implements IGrid, IPortableGrid { @Override public int getTabPage() { - return tabPage; + return Math.min(tabPage, getTotalTabPages()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index a4018dbcd..52ff4072e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -309,7 +309,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, @Override public int getTabPage() { - return world.isRemote ? TAB_PAGE.getValue() : tabPage; + return world.isRemote ? TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); } @Override