Fix colony teams assignment behaviour #10239
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Raycoms
reviewed
Sep 21, 2024
src/main/java/com/minecolonies/api/entity/citizen/AbstractEntityCitizen.java
Show resolved
Hide resolved
Raycoms
reviewed
Sep 21, 2024
src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityRaiderMob.java
Outdated
Show resolved
Hide resolved
Raycoms
reviewed
Sep 21, 2024
Raycoms
reviewed
Sep 21, 2024
src/main/java/com/minecolonies/core/network/messages/server/colony/ColonyDeleteOwnMessage.java
Show resolved
Hide resolved
someaddons
reviewed
Sep 29, 2024
|
Is there btw a reason you did remove the friendly fire setting? |
# Conflicts: # src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java
Raycoms
reviewed
Nov 3, 2024
someaddons
approved these changes
Nov 3, 2024
Raycoms
added a commit
that referenced
this pull request
Nov 4, 2024
Consistently ensure citizens are registered to the correct team Use the colony team name instead of a per citizen team Ensure that upon deletion of a colony it's respective team is removed Fix the colony deletion event not triggering for command based deletion
|
#10399 probably related |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed in this pull request
Testing
Review please