Merge pull request #285 from FTBTeam/1.19/dev

1.19/dev
FTBTeam · Jun 10, 2024 · b072d0e · b072d0e
2 parents 866ee15 + b93f2f9
commit b072d0e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 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).
 
+## [1902.4.5]
+
+### Fixed
+* Fixed the sidebar map buttons ignoring any GameStages restrictions in force
+
 ## [1902.4.4]
 
 ### Fixed

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
@@ -386,14 +386,15 @@ public void addWaypoint(Player player, String name, BlockPos pos, int color) {
 	}
 
 	public EventResult customClick(CustomClickEvent event) {
-		if (event.id().equals(BUTTON_ID_MAP)) {
-			openGui();
-			return EventResult.interruptTrue();
-		} else if (event.id().equals(BUTTON_ID_CLAIM)) {
-			new ChunkScreen().openGui();
-			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)) {
+				new ChunkScreen().openGui();
+				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=1902.4.4
+mod_version=1902.4.5
 mod_author=FTB Team
 minecraft_version=1.19.2
 forge_version=43.2.8