Skip to content

Fixes - #11796

Merged
Raycoms merged 2 commits into
version/mainfrom
fixes
Aug 30, 2026
Merged

Fixes#11796
Raycoms merged 2 commits into
version/mainfrom
fixes

Conversation

@someaddons

Copy link
Copy Markdown
Contributor

Prevent crash when a colony is in a dynamically loaded world Fix config descriptions, using the wrong key.
Fix config description including default value twice. Prevent crash with the RequestTreeWindowModule with zero Requests left

Checklist

  • [x ] I have read and accept the Contributing Guidelines
  • I have tested and confirmed my changes are working on the most recent commit of this pull request
  • I have used AI in the creation of this pull request

Related issues

Closes #11743
Closes #11793
Closes #11756

Changes proposed in this pull request

  • Prevent crash when a colony is in a dynamically loaded world
  • Fix config descriptions, using the wrong key.
  • Fix config description including default value twice.
  • Prevent crash with the RequestTreeWindowModule with zero Requests left

Review please

Prevent crash when a colony is in a dynamically loaded world
Fix config descriptions, using the wrong key.
Fix config description including default value twice.
Prevent crash with the RequestTreeWindowModule with zero Requests left
for (final IColony colony : IColonyManager.getInstance().getAllColonies())
{
if (colony.getPermissions().getRank(player).isColonyManager())
if (colony.getWorld() != null && colony.getPermissions().getRank(player).isColonyManager())

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since not all words are loaded from the get-go we cannot register to all colonies right away. Our existing dimension change hooks etc will take care of later registration

@Raycoms
Raycoms merged commit c2a9b28 into version/main Aug 30, 2026
5 checks passed
@Raycoms
Raycoms deleted the fixes branch August 30, 2026 01:29
Raycoms added a commit that referenced this pull request Aug 30, 2026
* Fixes:
Prevent crash when a colony is in a dynamically loaded world
Fix config descriptions, using the wrong key.
Fix config description including default value twice.
Prevent crash with the RequestTreeWindowModule with zero Requests left

* fix
genericJE added a commit to genericJE/minecolonies that referenced this pull request Aug 31, 2026
The doc set was verified against 1e1b1d8 (origin/release/1.21, still its
head). version/1.21 has since moved 7 commits: 6 .java files, 25 blueprints,
2 regenerated loot tables and one lang comment.

Corrections:

- Five raid config TOML keys were renamed in a8022f7 (ldtteam#11796) to match
  their fields. Fixed in the combat config table (00), the ServerConfiguration
  rows and prose in 06, and the tuning bullet in 14, with a note recording the
  old names and the fact that release/1.21 builds still use them.
- RequestTreeWindowModule.java is 412 lines, not 407 (11).
- WindowHutAllInventory inventoryHighlight moved to :123 / :140 (11).

Every doc header now cites version/1.21 @ a8022f7. 21 records what was
re-verified, what carried over unchanged, and the new upstream behaviour that
is not yet folded into the set.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Crash while trying to canceling villager request outdated config translation "Invalid Player Data" upon logging into the world

2 participants