search

mcpyproject / McPy

A open source Minecraft server written 100% in Python
GNU Affero General Public License v3.0
84 stars 15 forks source link

Update join/leave message wording #45

Closed randomairborne closed 3 years ago

randomairborne commented 3 years ago

Rename login and logout messages to match Minecraft

Geolykt commented 3 years ago

Oh, and you are targetting master, you should target development instead

0ddlyoko commented 3 years ago

It looks like there is a commit in this PR that should not be there https://prnt.sc/uzhg85 Could you remove it ? Thanks 😄

ntoskrnl4 commented 3 years ago

That commit is a commit that already exists in develop (in fact, it's the most recent commit to that branch). It's there because the PR was rebased onto develop from master as far as I can tell, or because they simply pulled the most recent changes onto their branch (when you pull changes from the branch yours is based off of, it'll show up in your branch as well).

aka. having it there doesn't mean anything and doesn't hurt anything

Geolykt commented 3 years ago

Any recommendations on how we are going to handle this? We could simply just reopen the PR, or does anyone have a better Idea?

0ddlyoko commented 3 years ago

Any recommendations on how we are going to handle this? We could simply just reopen the PR, or does anyone have a better Idea?

This is a common bug in GitHub (the fact that it does not detect that the commit is already in that branch). We can't do anything except waiting for the owner to force push by editing the commit message Anyways this change can be done in 5 minutes so this is not a real important PR, we could wait

ntoskrnl4 commented 3 years ago

As far as I can tell it looks like there's nothing to be done here and we can merge this whenever.

The extra commit from switching branches will disappear once it's merged, so the only actual change here is the message wording as relevant to the PR.

ntoskrnl4 commented 3 years ago

any objections to this merge?

Geolykt commented 3 years ago

No objections here