search

Pryaxis / TShock

☕️⚡️TShock provides Terraria servers with server-side characters, anti-cheat, and community management tools.
GNU General Public License v3.0
2.41k stars 377 forks source link

Update GetDataHandlers.cs #2823

Closed ATFGK closed 1 year ago

ATFGK commented 1 year ago

Fixes #2804

ATFGK commented 1 year ago

These two parameters cause other problems related to resurrection. I hope this conflict can be resolved.

ATFGK commented 1 year ago

Merge his or mine first, thank you

ATFGK commented 1 year ago

I hate having to rewrite it every time Tshock is updated. Is there any easier way?

drunderscore commented 1 year ago

I hate having to rewrite it every time Tshock is updated. Is there any easier way?

You should be rebasing your changes on top of general-devel whenever there is an update, but that might be difficult sometimes, especially if you've already done a merge into your branch. You can try:

git rebase origin/general-devel on your branch (which is general-devel which isn't the best, you should checkout a branch tracking general-devel, but too late now).

You'll likely have conflicts in the docs/changelog.md file, so resolve those properly, stage the file, and then git rebase --continue

Most people would rather just execute git merge origin/general-devel -- but whichever you end up doing, you're going to have conflicts with the changelog.