Merge pull request #71 from FTBTeam/1.21.1/dev

desht · web-flow · commit 6af177bcd30d · 2025-08-23T11:02:04.000+01:00
1.21.1/dev
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).
 
+## [2101.1.4]
+
+### Fixed
+* Fixed a FTB Team Bases related crash when attempting to visit bases of disbanded teams
+
 ## [2101.1.3]
 
 ### Added 
diff --git a/common/src/main/java/dev/ftb/mods/ftbteams/data/TeamManagerImpl.java b/common/src/main/java/dev/ftb/mods/ftbteams/data/TeamManagerImpl.java
@@ -104,7 +104,7 @@ public Map<String, Team> getTeamNameMap() {
 
 	@Override
 	public Optional<Team> getTeamByID(UUID teamId) {
-		return Optional.of(teamMap.get(teamId));
+		return Optional.ofNullable(teamMap.get(teamId));
 	}
 
 	@Override
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ maven_group=dev.ftb.mods
 readable_name=FTB Teams
 mod_author=FTB Team
 
-mod_version=2101.1.3
+mod_version=2101.1.4
 minecraft_version=1.21.1
 
 # Deps

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public Map<String, Team> getTeamNameMap() {`
`104`	`104`
`105`	`105`	`@Override`
`106`	`106`	`public Optional<Team> getTeamByID(UUID teamId) {`
`107`		`- return Optional.of(teamMap.get(teamId));`
	`107`	`+ return Optional.ofNullable(teamMap.get(teamId));`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Override`