Merge remote-tracking branch 'upstream/master'

2020-08-09 22:02:18 +03:00
parent 44a331c926 9deb84f881
commit 4c16fd967e
80 changed files with 791 additions and 449 deletions
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -608,6 +608,7 @@ DEF_CONSOLE_CMD(ConBanList)
 	uint i = 1;
 	for (const auto &entry : _network_ban_list) {
 		IConsolePrintF(CC_DEFAULT, "  %d) %s", i, entry.c_str());
+		i++;
 	}

 	return true;