Skip to content

Support alternative display name for /say commands #112

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.

Sign up for GitHub

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

Open
lawfulstupid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support alternative display name for /say commands #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions mcrcon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ static int global_disable_colors = 0;
static int global_connection_alive = 1;
static int global_rsock;
static int global_wait_seconds = 0;
static char *global_rcon_name = NULL;

#ifdef _WIN32
// console coloring on windows
Expand Down Expand Up @@ -170,6 +171,9 @@ int main(int argc, char *argv[])
if (!port) port = "25575";
if (!host) host = "localhost";

global_rcon_name = getenv("MCRCON_NAME");
if (!global_rcon_name || strlen(global_rcon_name) < 1) global_rcon_name = NULL;

// disable output buffering (https://github.com/Tiiffi/mcrcon/pull/39)
setvbuf(stdout, NULL, _IONBF, 0);
setvbuf(stderr, NULL, _IONBF, 0);
Expand Down Expand Up @@ -603,8 +607,31 @@ int rcon_auth(int sock, char *passwd)
return packet->id == -1 ? 0 : 1;
}

char* say2textraw(const char *message)
{
char *result = malloc(17 + strlen(global_rcon_name) + strlen(message));
strcpy(result, "tellraw @a \"<");
strcat(result, global_rcon_name);
strcat(result, "> ");
strcat(result, message);
strcat(result, "\"");
return result;
}

int rcon_command(int sock, char *command)
{
if (strlen(command) < 1) return 1;

// Remove leading "/"
if (strncmp("/", command, 1) == 0) {
command++; // move pointer forward 1
}

// Convert /say commands to /textraw to add name
if (global_rcon_name != NULL && strncmp("say", command, 3) == 0) {
command = say2textraw(command+4);
}

rc_packet *packet = packet_build(RCON_PID, RCON_EXEC_COMMAND, command);
if (packet == NULL) {
global_connection_alive = 0;
Expand Down