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

Jump to bottom

Town Merging issues #7099

Closed
BlueFyreMatt opened this issue Nov 21, 2023 · 3 comments · Fixed by #7102
Closed

Town Merging issues #7099

BlueFyreMatt opened this issue Nov 21, 2023 · 3 comments · Fixed by #7102
Assignees
@LlmDl
Labels
bug Completed
Milestone
0.100.1.0

Comments

@BlueFyreMatt
Copy link

What steps will reproduce the problem?

Towns cannot merge if they are in the same nation due to the calculation within the getMaxOutposts() method.

Given that remainingTown and succumbingTown have the same nation, their nation's outpost limit (nationOutposts) is the same. Therefore, the sum of their individual outpost limits (townOutposts + nationOutposts) will always be greater than the maximum allowed number of outposts (maxOutposts).

This error does still persist with towns that are not in the same nation and its likely there are further calculation issues for outposts when merging.

What is the expected output?

Towns should merge

Towny version

0.100.0.0

Server version

git-Purpur-2062 (MC: 1.20.1)*

Please use Pastebin.com to link the following files

.
LlmDl added a commit that referenced this issue Nov 21, 2023
@LlmDl
Fix outposts being counted wrong in town merge vetting code.
5a12fcb 
Closes #7099.
@LlmDl
Copy link
Member

LlmDl commented Nov 21, 2023

Give this a shot: https://cdn.discordapp.com/attachments/669247087329673228/1176672940826312805/towny-0.100.0.5.jar?ex=656fb912&is=655d4412&hm=38574c290256f6407c2dc9346e1358c31d70909d562dad9b4992d7ecca229298&

@BlueFyreMatt
Copy link
Author

Thank you, this does seem to fix the issue with outposts. We are experiencing issues with merge costs now but I'll close this and make a separate issue once I've had a chance to pinpoint the issue.

As always, thank you for being so quick with the fix!

@LlmDl
Copy link
Member

LlmDl commented Nov 22, 2023

If you enjoy quick fixes you should consider becoming a sponsor again. Only 1% of servers are sponsoring.

@LlmDl LlmDl mentioned this issue Nov 22, 2023
Merged
1 task
@LlmDl LlmDl self-assigned this Nov 22, 2023
@LlmDl LlmDl added this to the 0.100.1.0 milestone Nov 22, 2023
LlmDl added a commit that referenced this issue Nov 22, 2023
@LlmDl
- Fix outposts being counted wrong in town merge vetting code.
9a53f29 
    - Closes #7099.
  - Refactor KeepInventory and KeepExperience code.
    - Unblocks TownyAdvanced/SiegeWar#845.
  - Immediately schedule upcoming newday on paper servers, courtesy of
Warrior with PR #7101.
  - Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.1 to
3.2.2.
  - Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to
3.6.2.
  - Bump org.jetbrains:annotations from 24.0.1 to 24.1.0.
  - Bump com.github.seeseemelk:MockBukkit-v1.20 from 3.44.0 to 3.47.0.
  - Bump org.apache.commons:commons-compress from 1.24.0 to 1.25.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@LlmDl LlmDl

Labels
bug Completed
Projects
None yet
Milestone
0.100.1.0
Development

Successfully merging a pull request may close this issue.

Fix outposts being counted wrong in town merge vetting code. TownyAdvanced/Towny
2 participants
@LlmDl @BlueFyreMatt