From c0af44454a0134257fa3e131b2c1713dbb8c097d Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Mon, 25 Mar 2024 12:19:42 +0000 Subject: [PATCH 1/2] fix: fix NPE in LongRangePlayerTracker This is more of a band-aid than a full fix, but it prevents a server crash. I don't know what leads to the issue, which is FTB Teams not having a record of the player. https://github.com/FTBTeam/FTB-Mods-Issues/issues/1125 --- .../java/dev/ftb/mods/ftbchunks/LongRangePlayerTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/LongRangePlayerTracker.java b/common/src/main/java/dev/ftb/mods/ftbchunks/LongRangePlayerTracker.java index 7e589707..ce6d34ce 100644 --- a/common/src/main/java/dev/ftb/mods/ftbchunks/LongRangePlayerTracker.java +++ b/common/src/main/java/dev/ftb/mods/ftbchunks/LongRangePlayerTracker.java @@ -89,6 +89,6 @@ private boolean shouldTrack(ServerPlayer p1, ServerPlayer p2, int maxDistSq) { // and player 1 must be able to see player 2 (i.e. player 2's team settings must allow it) ChunkTeamDataImpl p2Team = ClaimedChunkManagerImpl.getInstance().getOrCreateData(p2); - return p2Team.canPlayerUse(p1, FTBChunksProperties.LOCATION_MODE); + return p2Team != null && p2Team.canPlayerUse(p1, FTBChunksProperties.LOCATION_MODE); } } From da0a04d9ccc1d9eddbda1de458457abff61b71ac Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Mon, 25 Mar 2024 12:20:47 +0000 Subject: [PATCH 2/2] build: version -> 2001.2.7, changelog updated --- CHANGELOG.md | 5 +++++ gradle.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c019433..b7489a57 100644 --- 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.2.7] + +### Fixed +* Fixed server crash related to long range player tracking + ## [2001.2.6] ### Fixed diff --git a/gradle.properties b/gradle.properties index a6faf34d..283c57f1 100644 --- 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.2.6 +mod_version=2001.2.7 mod_author=FTB Team minecraft_version=1.20.1