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.

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

Backport: 0.96.0.0 for 1.13.2 #3628

Merged
merged 573 commits into from
Mar 18, 2020
Merged

Backport: 0.96.0.0 for 1.13.2 #3628

merged 573 commits into from
Mar 18, 2020

Conversation

TheFlagCourier
Copy link
Member

@TheFlagCourier TheFlagCourier commented Jan 8, 2020

Description:

Backports the master branch to 1.13.2 for the 0.96.0.0 Release (Tentative). This should probably be the last 1.13 backport, barring any hot-fixes. Further modifications to Towny should not be held back for the sake of 1.13 backports, and working around API removals (as noted in next section) is not ideal.

Merge should not happen until:

  • Proper sanity checks from 1.13 admins are received
  • A 0.96.0.0 tag is assigned on the Master branch.
    Further changes to master will be cherry-picked in, if required.

New Nodes/Commands/ConfigOptions:

N/A - This is a backport to Spigot-API 1.13.2. Only changes made are for compatibility's sake.

The ProtectionRegenTask class from the 1.13 branch was used over the master branch's copy. This is due to BlockInventoryHolder not existing in the Spigot 1.13.2 API. This more than likely will cause issues, but it builds fine. A necessary fix can be made if required.


Relevant Towny Issue ticket:

N/A - No relevant issue ticket is open at this time.


  • I have tested this pull request for defects on a server.

❌ I do not run 1.13.x myself - though the following build (Towny-0.96.0.0-1.13.2-Alpha_8.jar) is available for those who wish to test and confirm for themselves.


Other Notes:

  • This release requires testing with the recommended TownyChat (and TownyNameUpdater) for 0.96.0.0 (ie: latest)
  • Regeneration Tasks may fail - I am not well associated with the methods that call the ProtectionRegenTask, so I cannot confirm or deny it's sanity.

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 Towny License for perpetuity.

@TheFlagCourier TheFlagCourier added the Seeking Community Feedback Tickets that require an open community discussion to further brainstorm ideas. label Jan 8, 2020
@TheFlagCourier TheFlagCourier added this to the 0.96.0.0 milestone Jan 8, 2020
@ghost
Copy link

ghost commented Jan 8, 2020

Yeah screw regen for 1.13, it's way too much work without the generified BlockInventoryHolder

@TheFlagCourier TheFlagCourier changed the title Backport Effort: 0.96.0.0 for 1.13 (Pre-Tag) Backport Effort: 0.96.0.0 for 1.13 (ALPHA) Jan 8, 2020
LlmDl and others added 22 commits January 9, 2020 12:47
Update Pom_Deb to match Pom, necessary changes to deploy-on-release
    - Javadocs should only build on the install phase.
    - Github actions should again function properly.
  - Change to saving for plotgroups on flatfile, removing now-redundant
world.
    - Already-made plot groups should load properly and save without a
world.
because we were matching the wrong player.
    - Closes #3635.
because we were matching the wrong player.
    - Closes #3635.
* Fix npe thrown from /plot group add when group name is not specified.

* Fix verion number on lang files

* Changed lang file version numbers

* Added clickable text to confirmations.

* Added lang file stuffs.

* Update message to indicate different methods of interaction.

* Fixed casting issues, and improved logic and formatting.

* Fixed invalid char error.

* Added white text to trailing part of the confirmation.

* Removed unused big

* Removed some unused imports
clicking on the text if you use Spigot.
    - Courtesy of Siris with PRs #3631 + #3639
    - Closes #3534.
    - Commands can still be used, clicking only for spigot servers, not
craftbukkit servers.
    - default: true
    - This setting only applies to servers running spigot, paper or
bungeecord.
    - On servers using craftbukkit.jar the notifications will always
appear in the chat.
    - When set to false the notifications will appear in the chat rather
than the action bar.
    - Closes #3636.
Rewrite TownyPermission data structure to a 2d boolean array
  - Fix message shown when a player tries to set their nation spawn in
the wilderness.
    - Closes #3640.
@GhaziShah
Copy link

Claimed townblocks are sometimes randomly unclaimed after restarts. I haven't found a way to consistently reproduce this, the chance of it occurring is higher the more towns you have (I have 100+ on my server). It seems to occur after server restarts when using flatfile. I'm sorry this can't be more informative, but I'm hard-pressed for details. Is this already a known issue, or should I file a bug report

@LlmDl
Copy link
Member

LlmDl commented Mar 18, 2020

Claimed townblocks are sometimes randomly unclaimed after restarts. I haven't found a way to consistently reproduce this, the chance of it occurring is higher the more towns you have (I have 100+ on my server). It seems to occur after server restarts when using flatfile. I'm sorry this can't be more informative, but I'm hard-pressed for details. Is this already a known issue, or should I file a bug report

It is an issue we have begun to see fairly rarely. Only one ticket has been filed as of today for it.

TheFlagCourier and others added 3 commits March 18, 2020 15:54
  - Bump version number for release.
  - Update bukkit api to 1.15.2.
* Add town spawn events.

* add nation spawn events.

* fixed javadocs

* revert event changes
@TheFlagCourier TheFlagCourier changed the title Backport Effort: 0.96.0.0 for 1.13 (ALPHA) Backport: 0.96.0.0 for 1.13.2 Mar 18, 2020
@LlmDl LlmDl merged commit 621f966 into 1.13.2 Mar 18, 2020
@LlmDl LlmDl deleted the backport/0.96.0.0 branch March 19, 2020 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Seeking Community Feedback Tickets that require an open community discussion to further brainstorm ideas.
Projects
None yet
Development

Successfully merging this pull request may close these issues.