search

OutpostUniverse / NetFixClient

Outpost 2 networking client module
0 stars 0 forks source link

Refactor do immediate processing #106

Closed Brett208 closed 4 years ago

Brett208 commented 4 years ago

The refactor didn't make the logic in OnImmediatePacketProcess as clean as I was hoping. reviewing the return statements and switch logic probably bears close scrutiny. I'm unsure if there are mistakes in the original code as the logic seems a bit too complicated.

EDIT: I based this on the branch IntegratePeerStatusEnum. I want to try switching the branch it is based on after merging the current base branch. I may need some help as this is a bit beyond my current comfort with Git.

Brett208 commented 4 years ago

Well, I think that went badly?

DanRStevens commented 4 years ago

It may have been possible to not even do the rebase, now that the base branch is already merged to master.

At any rate, at this point, you can git reset HEAD^ to remove the merge commit, run git rebase master to apply the branch changes on an updated master (make sure you update your local master branch first), and then git push -f to force push and overwrite the old history.

DanRStevens commented 4 years ago

Oh, one comment I forgot to make earlier. In regards to #104, all of the listed method are event handlers methods, and so all can be named in the OnX style. It was only the root method with the integrated check that was maybe a little odd for that naming.

Brett208 commented 4 years ago

Ah, thanks for fixing the merge issue. I was working coincident with you on the repository.