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

feat(newserver): Memories of Mars #2911

Merged
merged 41 commits into from Jun 18, 2020
Merged

feat(newserver): Memories of Mars #2911

merged 41 commits into from Jun 18, 2020

Conversation

ttocszed00
Copy link
Contributor

@ttocszed00 ttocszed00 commented Jun 1, 2020

Description

Server support for Memories of Mars

Fixes #2760

Type of change

  • Bug fix (a change which fixes an issue).
  • New feature (change which adds functionality).
  • New Server (new server added).
  • Refactor (restructures existing code).
  • Comment update (typo, spelling, explanation, examples, etc).

Checklist

PR will not be merged until all steps are complete.

  • This pull request links to an issue.
  • This pull request uses the develop branch as its base.
  • This pull request Subject follows the Conventional Commits standard.
  • This code follows the style guidelines of this project.
  • I have performed a self-review of my code.
  • I have checked that this code is commented where required.
  • I have provided a detailed with enough description of this PR.
  • I have checked If documentation needs updating.

Documentation

If documentation does need updating either update it by creating a PR (preferred) or request a documentation update.

Thank you for your Pull Request!

dgibbs64 and others added 11 commits June 17, 2020 23:46
* fix(bug): gamedig not using correct JSON object

Command to output the results for player count was looking at the wrong object in the tree. This change corrects it to the right objects.

* feat(monitor): Include bot count in monitor output

Update to include bot count in monitor output from Gamedig.

* fix(messages): Fix to set proper component logging

Fixed issue where messages from different actions weren't logging correctly due to using the wrong variable in when crafting the log message

* Confirm commit for changes made

Commit changes made after pull change submiited.

* fix(command_backup): Correct path for exludedir variable

The current implementation doesn't use the full file path to determine the existence of the backup directory in relation to the server which means the current stats just looks for the "lgsm/backup" directory. That may work if you're already in the root directory for the server but if you're scripting the backups via cron, you're not likely going to be invoking the backup from the root directory.

* fix: query_gamedig.sh tuning for correct player count

Reworked the jq flags to produce a count of players based on the length of the original JSON key used. However, I've found that while things like TF2 will produce the proper value, the Minecraft plugin will have an extra user online that is empty. See example below:

"players": [
    {
      "id": "81eeda65-9002-4f0d-9d3f-b4872e2a2042",
      "name": "iamjack1221"
    },
    {}
  ]

* correct else

* space

Co-authored-by: Daniel Gibbs <me@danielgibbs.co.uk>
@dgibbs64 dgibbs64 added this to the v20.4.0 milestone Jun 18, 2020
@dgibbs64 dgibbs64 added the type: game server request Request for a new server label Jun 18, 2020
@dgibbs64 dgibbs64 merged commit 5550303 into GameServerManagers:develop Jun 18, 2020
@dgibbs64 dgibbs64 linked an issue Jul 13, 2020 that may be closed by this pull request
4 tasks
@github-actions
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type: game server request Request for a new server
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Server Request] Memories of Mars
4 participants