Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #135

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Dev #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c773ba8
fix: handle possible null server registries in playerJoined listener
desht Nov 11, 2024
09712e7
build: version -> 2101.1.6, changelog updated
desht Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6]

### Fixed
* Fixed cross-mod compat issue causing crashes under some situations when players join

## [2101.1.5]

### Changed
Expand Down
5 changes: 4 additions & 1 deletion common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ private void serverStopped(MinecraftServer server) {
}

private void playerJoined(ServerPlayer player) {
NetworkHelper.sendTo(player, new SyncKnownServerRegistriesPacket(KnownServerRegistries.server));
if (KnownServerRegistries.server != null) {
// can be null, e.g. https://github.com/FTBTeam/FTB-Mods-Issues/issues/1387
NetworkHelper.sendTo(player, new SyncKnownServerRegistriesPacket(KnownServerRegistries.server));
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.daemon=false
# Mod
mod_id=ftblibrary
readable_name=FTB Library
mod_version=2101.1.5
mod_version=2101.1.6
mod_author=FTB Team
# Maven
archives_base_name=ftb-library
Expand Down
Loading