Merge pull request #283 from FTBTeam/1.20.4/dev

1.20.4/dev
FTBTeam · Jun 10, 2024 · fa36d57 · fa36d57
2 parents c61673f + cefd90c
commit fa36d57
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 * Fixed server crash related to long range player tracking
+* Fixed the sidebar map buttons ignoring any GameStages restrictions in force
 
 ## [2004.1.2]
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java
@@ -319,12 +319,14 @@ public boolean skipBlock(BlockState state) {
 	}
 
 	public EventResult customClick(CustomClickEvent event) {
-		if (event.id().equals(BUTTON_ID_MAP)) {
-			openGui();
-			return EventResult.interruptTrue();
-		} else if (event.id().equals(BUTTON_ID_CLAIM)) {
-			ChunkScreen.openChunkScreen();
-			return EventResult.interruptTrue();
+		if (FTBChunksWorldConfig.playerHasMapStage(Minecraft.getInstance().player)) {
+			if (event.id().equals(BUTTON_ID_MAP)) {
+				openGui();
+				return EventResult.interruptTrue();
+			} else if (event.id().equals(BUTTON_ID_CLAIM)) {
+				ChunkScreen.openChunkScreen();
+				return EventResult.interruptTrue();
+			}
 		}
 
 		return EventResult.pass();