summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Prevent infinite loop when logging fails (#3693)josh-parris2017-05-051-0/+1
| | | | Prevent infinite loop when logging fails
* Fixed looping when unable to bind port (#3621)johnsoch2017-03-171-0/+7
| | | Fixes #3593
* Changed world_end to world_the_end #3531 (#3538)Bond-0092017-02-241-11/+26
|
* Add support for alternate config file locations (#3578)Gareth Nelson2017-02-221-1/+7
|
* DeadlockDetect now lists some tracked CS's stats.Mattes D2017-01-181-7/+7
|
* Disconnect sent flag addedsweetgiorni2017-01-031-5/+6
| | | | Truthiness no longer assumed
* Player checksweetgiorni2017-01-031-4/+7
| | | | | Checks if there are any players connected to the server before running PlayerCallback and waiting 1 second.
* Api Documentationsweetgiorni2017-01-031-1/+1
| | | | | Added API documentation for GetShutdownMessage. Style fix in Root.cpp
* Custom Disconnect Messagesweetgiorni2017-01-031-0/+16
| | | | | | Adds a m_ShutdownMessage option to the settings. When the stop command is issued, players are kicked with said message before the server shuts down.
* Fix crash after attempting to kill a non-running thread (#3504)Fabian Stein2017-01-011-4/+7
| | | Fixes #3221
* Disabled anticheat (#3511)LogicParrot2017-01-011-1/+2
|
* Use CMake's Android generators to crosscompileTiger Wang2016-12-121-12/+10
|
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-181-13/+17
|
* Anticheat fastbreak (#3411)mohe20152016-11-061-0/+3
| | | Added block hardness checks when breaking blocks.
* Remove settings.ini world migration code (#3360)LogicParrot2016-08-291-49/+0
|
* Fix the error in #3270.Alexander Harkness2016-07-291-1/+1
|
* Tab completion across worlds (#3270)Alexander Harkness2016-07-211-0/+30
| | | Fixes #2563.
* SelfTests: Removed the unneeded cSelfTests class.Mattes D2016-06-181-6/+0
|
* Auto clean bad world linkagesLogicParrot2016-04-191-1/+1
|
* Write to console when autofixing linkagesLogicParrot2016-02-091-0/+1
|
* Merge pull request #2990 from LogicParrot/defaultWorldLogicParrot2016-02-081-1/+2
|\ | | | | Add DefaultWorld to newly generated INI
| * Add DefaultWorld to newly generated INILogicParrot2016-02-081-1/+2
| |
* | remove cWorld::createAndInitializeWorldLogicParrot2016-02-081-28/+1
|/
* Merge pull request #2961 from LogicParrot/enforceLogicParrot2016-02-081-3/+12
|\ | | | | [PhantomWorlds - 4] Prevent server from starting if there's bad world linkage
| * Prevent server from starting if there's bad world linkageLogicParrot2016-02-051-3/+12
| |
* | Proper world linkages and dimension types for newly created world.ini'sLogicParrot2016-02-061-1/+59
|/
* Fix unexpected world creation introduced by #2821LogicParrot2016-02-041-1/+1
|
* Front-end updateMathias2016-01-281-1/+0
|
* Fix running as a service.Anthony Birkett2016-01-211-10/+3
| | | | | | | | | | Two problems identified, both traced to commit 4315a11 (main.cpp) ParseArguments() was no longer being called before checking cRoot::m_RunAsService. This led to m_RunAsService never being set (we use -d on the command line to instigate a service start). (Root.cpp) Terminate events were being ignored when running as a service. We only need to ignore the cin.good() call, not terminate events as a whole.
* Fixed crash introduced by #2821LogicParrot2016-01-121-29/+31
|
* Merge pull request #2821 from LogicParrot/world2LogicParrot2016-01-121-2/+48
|\ | | | | Fix pre - #2815 default world linkage configs
| * Fix pre - #2815 default world linkage configsSafwat Halaby2015-12-251-2/+48
| |
* | Fixed Clang warnings.Mattes D2016-01-061-3/+3
|/
* Nether and End in settings.ini by default, and created at startupSafwat Halaby2015-12-251-3/+17
|
* Added HTTPS links wherever they are supported.Alexander Harkness2015-12-191-4/+4
|
* Implemented brewingLukas Pioch2015-11-031-5/+3
|
* Namechange to CuberiteMattes D2015-09-251-1/+1
|
* Increase robustness of the logging subsystemtycho2015-09-151-9/+10
|
* Include signal.h jointly for POSIX systemsMatti Hanninen2015-08-271-5/+7
| | | | | Otherwise, for example, FreeBSD the build fails due to SIGKILL not being around.
* Cast UINT to WORD to appease warningTiger Wang2015-08-221-6/+5
| | | | * Additional minor cleanups
* Fixed and improved restartingTiger Wang2015-08-201-130/+161
| | | | | Restarts are now an actual, close-as-possible to application exit+reopen.
* Fix old style casts and implicit conversionsMatti Hänninen2015-08-121-2/+2
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-291-5/+5
|
* Updated and submodularised JsonCPPTiger Wang2015-07-101-0/+2
| | | | | Conflicts: lib/jsoncpp
* Merge pull request #2241 from lkolbly/masterworktycho2015-06-261-2/+5
|\ | | | | Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
| * Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld.Lane Kolbly2015-06-131-2/+5
| |
* | Fixed log files' timestampsTiger Wang2015-06-141-1/+1
|/ | | | | Also made Release mode log less technical information about the world storage threads.
* Fixed build error on LinuxAlexander Harkness2015-06-121-1/+1
|
* SelfTests are registered and executed after logging framework init.Mattes D2015-06-111-3/+14
| | | | Fixes #2228.
* Daemon support on Linux.Anthony Birkett2015-06-051-1/+1
| | | | Added null console log listener, avoid printf() when stdout is closed.
* Fix for the way connecting clients receive player lists and broadcast chatb33duck2015-05-291-2/+17
|
* Added method to get the uptime of the server in seconds. Implements #1650.Lukas Pioch2015-05-261-16/+16
|
* Move make_unique into a namespace to avoid ADL issuestycho2015-05-161-2/+2
| | | | this prevents VS finding std::make_unique for constructors that take types from std
* Initial implementation of IniFile overloadingtycho2015-05-161-27/+30
|
* CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-091-2/+2
|
* Eliminate race condition in cRoot::FindAndDoWithPlayerworktycho2015-04-241-4/+4
| | | Avoid a race condition where a player gets deleted during the FindAndDoWithPlayer callback by moving the callback into DoWithPlayer.
* Fixed crash on exit introduced with Windows Service capability.Mattes D2015-04-051-20/+14
| | | | Ref.: #1845
* Working as a Windows service. Starts and stops correctly.Anthony Birkett2015-04-011-1/+11
| | | | | | | | | Added "/service" switch, to prompt the binary to attempt starting as a service. Added service* methods, to control service startup. Split up main() into universalMain(), which contains the startup code for both service and normal start. Added cRoot::m_RunningAsService bool, Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller. Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set.
* Fixed server failure to open any port not aborting the server.Mattes D2015-01-271-29/+35
|
* Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types.Kirill Kirilenko2015-01-171-1/+1
|
* Init Mojang API pointerworktycho2014-12-231-0/+1
| | | Fixes CID 90583
* Fixed crash on restartTiger Wang2014-12-211-3/+12
|
* Fixed print of milliseconds from chronoLukas Pioch2014-12-121-1/+1
|
* Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-101-0/+16
|\ | | | | Prevent multiple logins with same username, unless allowed in settings
| * Changed DoWithPlayer to auto instead of using iterator.Vincent2014-12-091-2/+2
| |
| * created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World.Vincent2014-12-081-1/+8
| |
| * Fixed compile errorsVincent2014-12-081-1/+1
| |
| * Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added.Vincent2014-12-081-0/+9
| |
* | Fixed compiling.Howaner2014-12-091-1/+1
| |
* | Fixed trailing whitespace.Mattes D2014-12-041-1/+1
| |
* | Merged branch 'origin/master' into c++11.Mattes D2014-12-041-1/+1
|\|
| * cRoot: Fixed a memory leak with cRankManager.Mattes D2014-11-261-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-0/+16
|\| | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * Fixed trailing whitespace.Mattes D2014-11-121-1/+1
| |
| * renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-051-2/+2
| |
| * Added FindAndDoWithUUIDLukas Pioch2014-11-021-0/+16
| |
* | Merged branch 'master' into c++11.Mattes D2014-10-241-3/+2
|\|
| * Merged IniFile into main MCS sources.Mattes D2014-10-231-3/+2
| |
| * En masse NULL -> nullptr replaceTiger Wang2014-10-231-22/+22
| |
* | SuggestionsTiger Wang2014-10-241-1/+1
| |
* | En masse NULL -> nullptr replaceTiger Wang2014-10-201-20/+20
| |
* | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-201-9/+3
| |
* | Migrated random generators to std::randomTiger Wang2014-10-191-16/+6
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-191-1/+2
|\|
| * Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-181-1/+2
| |\ | | | | | | Improved furnaces
| | * Fixed failure for cRankManager to restartTiger Wang2014-10-181-1/+2
| | |
* | | Use std::threadTiger Wang2014-10-191-10/+20
|/ /
* / cMojangAPI: Don't update data if server is in offline mode.Mattes D2014-10-171-2/+3
|/
* Dropped support for <1.7.xTiger Wang2014-09-271-12/+0
|
* Fixed minor style issues.madmaxoft2014-09-171-2/+2
|
* Added abilty to set build infoTycho2014-09-101-0/+6
| | | | | build info is displayed at startup Fixes #1410
* capitalisation errorworktycho2014-09-081-1/+1
|
* derpworktycho2014-09-081-1/+1
|
* If server fails init, save any changed or generated settings.worktycho2014-09-081-0/+1
|
* Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-291-24/+19
|\ | | | | | | | | Conflicts: src/Server.cpp
| * Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-221-8/+18
| |\
| | * Renamed LoggersTycho2014-08-121-7/+7
| | |
| | * First Implementatation of new Loggin frameworkTycho2014-08-101-8/+18
| | |
| * | Removed cGroup and cGroupManager.Mattes D2014-08-211-16/+0
| | |
| * | RankMgr: Initial migration code.madmaxoft2014-08-131-0/+1
| |/
* / Added new console command with cleanupTiger Wang2014-08-291-11/+3
|/
* Merged branch 'master' into NameToUUID.madmaxoft2014-07-311-12/+24
|\
| * Merged branch 'howaner/Options'.madmaxoft2014-07-301-2/+2
| |\
| | * Add "Broadcasting" settings to world.iniHowaner2014-07-271-2/+2
| | |
| * | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-2/+4
| | |
| * | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-15/+13
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * | Bug and crash fixesTiger Wang2014-07-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
| * | Merge branch 'master' into portalsTiger Wang2014-07-181-9/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * | | Portal improvements and suggestionsTiger Wang2014-06-101-3/+3
| | | |
| * | | Implemented end and nether portalsTiger Wang2014-05-311-8/+13
| | | |
* | | | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.madmaxoft2014-07-301-0/+1
| |_|/ |/| | | | | | | | The cache is persisted into a SQLite DB file on server shutdown.
* | | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-12/+12
| | |
* | | Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-3/+3
| | |
* | | main.cpp: field style fixesarchshift2014-07-201-4/+4
| | |
* | | main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATEDarchshift2014-07-191-2/+0
| |/ |/|
* | Fixed spaces around single-line comments.madmaxoft2014-07-171-3/+3
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
* | Fixed basic whitespace problems.madmaxoft2014-07-171-4/+4
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
* | Store properties as Json::ValueTiger Wang2014-07-161-1/+1
| |
* | Player properties are now retrievedTiger Wang2014-07-141-2/+2
|/
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-8/+6
|
* Added Yggdrasil Authentication Systemdaniel09162014-04-131-2/+2
| | | | Code by Howaner. Fixes/Changes by me.
* Fixed a minor ini key duplication bugTiger Wang2014-03-291-0/+1
|
* Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-5/+5
|
* Fixed more Format issuesTycho2014-03-111-5/+5
|
* Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-4/+2
|
* cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+0
|
* Unicode :-(Howaner2014-02-211-1/+1
|
* Add 'Group not found', when the Server load the users.ini and add auto generate from users.iniHowaner2014-02-211-1/+3
|
* Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-2/+2
|
* Implemented cCompositeChat.madmaxoft2014-02-151-1/+13
| | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-5/+12
|\ | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * WebAdmin is stopped properly on server shutdown / restart.madmaxoft2014-02-071-5/+2
| | | | | | | | Fixes #272.
| * Fixed wiki link in auto-generated settings.ini.madmaxoft2014-02-071-1/+2
| |
| * Improvements:STRWarrior2014-02-051-0/+9
| | | | | | | | | | | | Adds a function in cRoot that allows you to reload all the groups permissions. Note: Players don't automatically load their new permissions. You can use cPlayer::LoadPermissionsFromDisk for that.
* | Improved chat messaging functionsTiger Wang2014-02-071-2/+2
|/ | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* Fixed timing on *nix.madmaxoft2014-01-281-1/+1
|
* Fixed GetPhysicalRAMUsage on Linuxandrew2014-01-011-2/+2
|
* Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-221-9/+25
|\
| * Added many event catchersTiger Wang2013-12-221-9/+25
| | | | | | | | | | | | * Window close * CTRL-C * etc.
* | Root is now warnings cleanTycho Bickerstaff2013-12-211-1/+1
|/
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-34/+38
|
* HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used.STRWarrior2013-12-111-0/+1
|
* Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.STRWarrior2013-12-111-0/+18
|
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-1/+1
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | | | | | Ref.: #407
* | Console trims its commands before executing 'emTiger Wang2013-12-071-3/+3
|/
* DeadlockDetect is configurable now.madmaxoft2013-11-301-4/+7
| | | | This is needed when debugging Lua plugins.
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-1/+1
|
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+10
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+744