1
0
Fork 0
Commit Graph

192 Commits

Author SHA1 Message Date
LogicParrot d4353f8084 Disabled anticheat (#3511) 2017-01-01 15:47:17 +02:00
Tiger Wang 8c6d0b51c7 Use CMake's Android generators to crosscompile 2016-12-12 14:32:32 +00:00
Mattes D 0bffa29358 Removed ClientHandle.h dependencies from common headers. 2016-11-18 20:00:04 +01:00
mohe2015 32b38fb264 Anticheat fastbreak (#3411)
Added block hardness checks when breaking blocks.
2016-11-06 19:30:19 +01:00
LogicParrot dd8daaf63e Remove settings.ini world migration code (#3360) 2016-08-29 17:27:38 +03:00
Alexander Harkness fb2e231f5e Fix the error in #3270. 2016-07-29 19:51:33 +01:00
Alexander Harkness a2a9341c24 Tab completion across worlds (#3270)
Fixes #2563.
2016-07-21 13:00:30 +02:00
Mattes D 36eefbf0f2 SelfTests: Removed the unneeded cSelfTests class. 2016-06-18 13:12:10 +02:00
LogicParrot 9b60ee6e43 Auto clean bad world linkages 2016-04-19 12:06:52 +03:00
LogicParrot 3fb32a5535 Write to console when autofixing linkages 2016-02-09 10:02:36 +02:00
LogicParrot bcbfd3348d Merge pull request #2990 from LogicParrot/defaultWorld
Add DefaultWorld to newly generated INI
2016-02-08 12:49:20 +02:00
LogicParrot dd34243521 Add DefaultWorld to newly generated INI 2016-02-08 12:26:21 +02:00
LogicParrot 3efdfca61d remove cWorld::createAndInitializeWorld 2016-02-08 12:17:10 +02:00
LogicParrot ed97946bb9 Merge pull request #2961 from LogicParrot/enforce
[PhantomWorlds - 4] Prevent server from starting if there's bad world linkage
2016-02-08 11:57:57 +02:00
LogicParrot 96f9afa278 Proper world linkages and dimension types for newly created world.ini's 2016-02-06 10:18:13 +02:00
LogicParrot d8861da599 Prevent server from starting if there's bad world linkage 2016-02-05 15:34:16 +02:00
LogicParrot 8f7d929140 Fix unexpected world creation introduced by #2821 2016-02-04 10:06:07 +02:00
Mathias 152c7c064a Front-end update 2016-01-28 20:01:42 +02:00
Anthony Birkett d75168ca03 Fix running as a service.
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.
2016-01-21 16:38:13 +00:00
LogicParrot 41f2b6c99f Fixed crash introduced by #2821 2016-01-12 15:13:53 +02:00
LogicParrot a4a17a2953 Merge pull request #2821 from LogicParrot/world2
Fix pre - #2815 default world linkage configs
2016-01-12 10:24:44 +02:00
Mattes D 491dbda7d3 Fixed Clang warnings. 2016-01-06 16:20:12 +01:00
Safwat Halaby 74912a2aaf Fix pre - #2815 default world linkage configs 2015-12-25 14:59:54 +02:00
Safwat Halaby b4649248d1 Nether and End in settings.ini by default, and created at startup 2015-12-25 13:49:13 +02:00
Alexander Harkness 8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
Lukas Pioch 9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Mattes D 82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
tycho 3187dbf0aa Increase robustness of the logging subsystem 2015-09-15 16:19:49 +01:00
Matti Hanninen c3d84a24a9 Include signal.h jointly for POSIX systems
Otherwise, for example, FreeBSD the build fails due to SIGKILL not being
around.
2015-08-27 08:15:08 +03:00
Tiger Wang 3e0af6ca36 Cast UINT to WORD to appease warning
* Additional minor cleanups
2015-08-22 14:21:25 +01:00
Tiger Wang 4315a11393 Fixed and improved restarting
Restarts are now an actual, close-as-possible to application
exit+reopen.
2015-08-20 16:15:23 +01:00
Matti Hänninen b20294604c Fix old style casts and implicit conversions 2015-08-12 16:51:38 +03:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Tiger Wang ccfe04a0a2 Updated and submodularised JsonCPP
Conflicts:
	lib/jsoncpp
2015-07-09 23:10:51 +01:00
worktycho 0a7c54261f Merge pull request #2241 from lkolbly/master
Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
2015-06-26 14:12:29 +01:00
Tiger Wang 882f7c70c0 Fixed log files' timestamps
Also made Release mode log less technical information about the world
storage threads.
2015-06-14 11:23:14 +01:00
Lane Kolbly 9d620a20a0 Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. 2015-06-13 16:09:43 -05:00
Alexander Harkness 070801d561 Fixed build error on Linux 2015-06-12 11:57:34 +01:00
Mattes D d390214929 SelfTests are registered and executed after logging framework init.
Fixes #2228.
2015-06-11 22:20:04 +02:00
Anthony Birkett 9dac390247 Daemon support on Linux.
Added null console log listener, avoid printf() when stdout is closed.
2015-06-05 15:47:47 +01:00
b33duck 022348645e Fix for the way connecting clients receive player lists and broadcast chat 2015-05-28 19:43:16 -07:00
Lukas Pioch c3b872ad93 Added method to get the uptime of the server in seconds. Implements #1650. 2015-05-26 05:36:46 +02:00
tycho c96849f431 Move make_unique into a namespace to avoid ADL issues
this prevents VS finding std::make_unique for constructors that take types from std
2015-05-16 10:47:04 +01:00
tycho b9efa02c80 Initial implementation of IniFile overloading 2015-05-16 10:46:51 +01:00
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
worktycho 20593dcb35 Eliminate race condition in cRoot::FindAndDoWithPlayer
Avoid a race condition where a player gets deleted during the FindAndDoWithPlayer callback by moving the callback into DoWithPlayer.
2015-04-24 12:45:44 +01:00
Mattes D 31953b19b8 Fixed crash on exit introduced with Windows Service capability.
Ref.: #1845
2015-04-05 17:07:29 +02:00
Anthony Birkett 51891b766c Working as a Windows service. Starts and stops correctly.
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.
2015-04-01 00:03:37 +01:00
Mattes D de7f5fc794 Fixed server failure to open any port not aborting the server. 2015-01-27 14:53:38 +01:00
Kirill Kirilenko 41f30edcf7 Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types. 2015-01-17 16:00:12 +03:00
worktycho 9fde173142 Init Mojang API pointer
Fixes CID 90583
2014-12-23 00:41:46 +00:00
Tiger Wang 0d6672bf5d Fixed crash on restart 2014-12-21 14:31:20 +00:00
Lukas Pioch ece8b8ac96 Fixed print of milliseconds from chrono 2014-12-12 15:10:29 +01:00
Mattes D 32bce44f1f Merge pull request #1623 from p-mcgowan/issue_1253
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
Howaner e21159d4a8 Fixed compiling. 2014-12-09 13:29:22 +01:00
Vincent e9a27db028 Changed DoWithPlayer to auto instead of using iterator. 2014-12-08 15:58:46 -08:00
Vincent e28cc876c4 created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World. 2014-12-08 00:57:46 -08:00
Vincent 6de07d4a39 Fixed compile errors 2014-12-08 00:45:29 -08:00
Vincent d8d3b9aec5 Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added. 2014-12-08 00:12:48 -08:00
Mattes D 64f8428d03 Fixed trailing whitespace. 2014-12-04 22:07:04 +01:00
Mattes D c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Mattes D a9e77fe7da cRoot: Fixed a memory leak with cRankManager. 2014-11-26 11:00:46 +01:00
Tiger Wang 79e5b82354 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/Noise/Noise.h
	src/World.h
2014-11-23 17:12:34 +00:00
Mattes D c9a3cb4d3f Fixed trailing whitespace. 2014-11-12 21:59:42 +01:00
Lukas Pioch 13b20d6fe2 renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump 2014-11-05 21:57:38 +01:00
Lukas Pioch 9f71a4e7ae Added FindAndDoWithUUID 2014-11-02 21:01:23 +01:00
Mattes D 765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Tiger Wang 51fa6b4090 Suggestions 2014-10-23 23:58:01 +01:00
Mattes D 449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang 987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Tiger Wang aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Tiger Wang cc600de51f Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-19 12:34:05 +01:00
Tiger Wang 6d5a8892f3 Use std::thread 2014-10-19 00:29:34 +01:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Tiger Wang eb821ff240 Fixed failure for cRankManager to restart 2014-10-18 19:55:01 +01:00
Mattes D 687752241f cMojangAPI: Don't update data if server is in offline mode. 2014-10-17 13:57:18 +02:00
Tiger Wang 72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
madmaxoft 95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02:00
Tycho 27be179939 Added abilty to set build info
build info is displayed at startup
Fixes #1410
2014-09-10 16:07:00 +01:00
worktycho 64071aeda9 capitalisation error 2014-09-08 17:45:23 +01:00
worktycho 4613fabd45 derp 2014-09-08 15:15:31 +01:00
worktycho 5f207c8bb7 If server fails init, save any changed or generated settings. 2014-09-08 14:57:58 +01:00
Tiger Wang 431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer
Conflicts:
	src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang 618741f78e Added new console command with cleanup 2014-08-29 14:43:49 +01:00
Mattes D e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Mattes D 8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +02:00
madmaxoft e110f72268 RankMgr: Initial migration code. 2014-08-13 09:53:33 +02:00
Tycho 9844368267 Renamed Loggers 2014-08-12 16:05:04 +01:00
Tycho 806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft 4dd858f899 Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.
The cache is persisted into a SQLite DB file on server shutdown.
2014-07-30 13:56:29 +02:00
madmaxoft f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Howaner a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
Tiger Wang a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang 3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft 6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
Tiger Wang 6ab9afd0fd Bug and crash fixes
* 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
2014-07-20 10:46:45 +01:00