boy0001 / WorldEdit

Blazingly fast world manipulation for artists, large networks and developers
https://www.spigotmc.org/resources/13932/
Other
4 stars 1 forks source link

Restore the formatting of many things to upstream WorldEdit - no code changes #24

Closed Combustible closed 5 years ago

Combustible commented 5 years ago

This patch touches many files but changes absolutely no functionality. The goal here is to make future merges with worldedit produce fewer conflicts that have to be resolved.

This patch was made by painstakingly diff'ing files and copying changes over from the last upstream merge commit (02c6f11b) into this codebase.

This looks extremely random, like I have some strange OCD about formatting in one spot and then I change my mind on other files. Whitespace is added in some spots, and removed in others - insanity. None of these changes are "mine" - they're what is in the upstream world edit repo.

Here's the diff before the change:

git diff 02c6f11b origin/master --stat
1204 files changed, 146715 insertions(+), 11703 deletions(-)

Here's the diff after this change:

git diff 02c6f11b HEAD --stat
1075 files changed, 146194 insertions(+), 11100 deletions(-)

That's 130 fewer files to generate merge conflicts in the future. Before this change there are only 364 files that FAWE edits (as opposed to just adding new files) - after this change only 236 remain.

Commit 02c6f11b was the last merge commit Jesse made back in October.

NotMyFault commented 5 years ago

Thanks a lot :)