Merge pull request #281 from FTBTeam/1.20.1/dev

1.20.1/dev
FTBTeam · May 28, 2024 · 505ef90 · 505ef90
2 parents 349944c + f0facb4
commit 505ef90
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2001.3.1]
+
+### Fixed
+* Fixed the sidebar map buttons ignoring any GameStages restrictions in force
+
 ## [2001.3.0]
 
 ### Changed

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
@@ -321,12 +321,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();

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 mod_id=ftbchunks
 archives_base_name=ftb-chunks
 maven_group=dev.ftb.mods
-mod_version=2001.3.0
+mod_version=2001.3.1
 mod_author=FTB Team
 
 minecraft_version=1.20.1