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

All dev changes from GreenSurvivors #383

Merged
merged 116 commits into from
Mar 6, 2024
Merged

All dev changes from GreenSurvivors #383

merged 116 commits into from
Mar 6, 2024

Conversation

addstar
Copy link
Member

@addstar addstar commented Mar 3, 2024

As per the discussion in #381, we decided it would be best for us to just merge in the dev branch changes from GreenSurvivors.

Since we no longer do actual releases (or at least, we haven't in a very long time) and Minigames is only available for now as dev builds, we figured it's fine to pull in these dev changes so we can do our own testing/validation. I had planned to just cherry-pick fixes but there were so many good fixes and improvements it wasn't worth it 😉

If anyone has troubles with these changes, they can revert to the previous build and report the issues to us.

@FireInstall @joshi1999: Just wanted to double check there's nothing in here that you think we should avoid? Also, we've included the changes that add your team to the plugin.yml authors, you deserve it! Thank you! ❤️

joshi1999 and others added 30 commits January 30, 2022 18:16
Offhand can now be placed without errors
Adding new 1.16 materials and prevent outdating through new materials.
Fixing not visible tool-points
- Change RegionDisplay to Barrier and imporved performance issues, when many and big regions were displayed
Action "Take Item" had another name in the gui -> "Give Item"
Several translation string were missed or were not correctly used.
- TakeFlagTrigger wasn't triggered
- Only Oak-Signs worked as Flags
- Broadcasts wasn't working
- CTF-Broadcasts are now a seperate option
- Flag Home-Returns were announced, even though broadcasts were disabled
Severall Bugfixes for gui and game elements;
Adding some new Game Elements like, potionFriendlyFire and gameTickTriggers.
* Fixed reset of Blocks in Minigames.
RegenRegions can now be splittet into several smaller regions. This allows to be more flexible: Big Regions with eg. 4 million blocks are crashing the server. If only small fitting regions are set, there is no need for 4 million blocks to regen.
Also a block limit is implemented to ensure that a crash is not going to happen. This limit can be changed within the minigames config file and is default set to 300k.
FireInstall and others added 12 commits January 23, 2024 16:25
In rare occasions a user can be a spectator as well as a player (however that happened)
This may still have a desync problem with the client where menu items are invisible.
This, however is a client problem and even player.updateInventory will not help, as it get called anyway if the event gets cancelled.
RegenRecorder etc. are working now just fine
Adding recorder deactivation option
Adding missing Team Colors
@addstar addstar self-assigned this Mar 3, 2024
@addstar addstar changed the title Green dev All dev changes from GreenSurvivors Mar 3, 2024
@addstar
Copy link
Member Author

addstar commented Mar 3, 2024

I noticed a few Codacy issues that I probably agree with, so I might also add a few minor commits to make it happy.

@FireInstall
Copy link
Contributor

Looks good to me.
However, please keep in mind you have to merge your changes in the future as all 3 of them got addressed in future changes.

@addstar
Copy link
Member Author

addstar commented Mar 5, 2024

Looks good to me. However, please keep in mind you have to merge your changes in the future as all 3 of them got addressed in future changes.

When you say all 3 do you mean the codacy changes? Or something else? Sorry I'm not sure I understood that.

@FireInstall
Copy link
Contributor

yeah all 3 codacy changes

@addstar
Copy link
Member Author

addstar commented Mar 6, 2024

yeah all 3 codacy changes

Oh no problem, happy to take your fix (I didn't see it) instead, I assume they're very similar to what I did? Or I can just merge this now and just handle the merge conflict later when I pull in your fix.

@addstar addstar merged commit 12c5168 into master Mar 6, 2024
4 checks passed
@addstar
Copy link
Member Author

addstar commented Mar 6, 2024

Decided to just merge this and we'll just see how we go in the future and we'll do our testing 🙂

Thank you again for all your fixes, improvements and changes! ❤️

@addstar addstar deleted the green_dev branch March 6, 2024 04:35
@addstar addstar restored the green_dev branch March 6, 2024 11:35
addstar added a commit that referenced this pull request Mar 6, 2024
addstar added a commit that referenced this pull request Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants