-
-
Notifications
You must be signed in to change notification settings - Fork 46
Increase Protection for Nation Capitals & Re-enforce bonds between Occupied Towns and their Original Nations #980
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.
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
Conversation
7cd0007 to
fba02d0
Compare
LlmDl
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found one issue I think, but there does seem to be a number of unneeded diffs throughout.
src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownyChatEventListener.java
Outdated
Show resolved
Hide resolved
cc32800 to
202441f
Compare
202441f to
7f5c6be
Compare
|
I think another issue with the chat listener, while the sender being occupied and being handled is done, you're not doing the same for recipients who will be seeing the chat of their occupying nation, but only be able to speak to their home nation. |
7f5c6be to
acb8009
Compare
|
Fixed now I think:
|
src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarStatusScreenListener.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarStatusScreenListener.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownyChatEventListener.java
Outdated
Show resolved
Hide resolved
acb8009 to
4ad0e54
Compare
4ad0e54 to
9cdfccd
Compare
LlmDl
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As an aside I see you're now using a different code style with { } on separate lines. This is not usually how we do things. Did your IDE or your habits change?
src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarTownPeacefulnessUtil.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarImmunityUtil.java
Outdated
Show resolved
Hide resolved
- Nation Capitals cannot be captured - Nation Capitals cannot go peaceful - If a Nation Capital is sieged, its post-siege immunity is doubled. - If a town is captured from its home nation, the TownyChat NC and AC channels continue to relate to the home nation. Bug Fix - This commit also fixes a bug where the siege status was not being loaded correctly.
9cdfccd to
87094a6
Compare
|
About the curly brackets, I don't recall when I changed that. By coincidence, I am currently messing with auto-code-formatters to standardize that sort of thing at my workplace!. |
LlmDl
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm good to go with the changes.
Description:
Background
There are 2 reasons for this PR:
Summary
Predicted Benefits
Deliberately NOT a Full Occupation System
New Nodes/Commands/ConfigOptions:
N/A
Relevant Issue ticket:
Closes #924
By making this pull request, I represent that I have the right to waive copyright and related rights to my contribution, and agree that all copyright and related rights in my contributions are waived, and I acknowledge that the TownyAdvanced organization has the copyright to use and modify my contribution under the SiegeWar License for perpetuity.