1
0
Fork 0
Commit Graph

123 Commits

Author SHA1 Message Date
Vincent 61e761fdc2 issue 1253 - prevent multiple logins with same username 2014-11-29 00:36:15 -08:00
Mattes D 765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02: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
Alexander Harkness 3e0f7c2b1c Missing space. 2014-10-21 14:17:36 +01:00
Tiger Wang 987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang 2334c8dd9d Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-20 19:01:53 +01:00
Tiger Wang bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Julian Laubstein d2cc1e0cd3 Fix for fix #1552 2014-10-20 15:58:08 +02:00
Julian Laubstein c2560cc1be Added error message 2014-10-20 15:08:48 +02:00
Tiger Wang aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Mattes D 687752241f cMojangAPI: Don't update data if server is in offline mode. 2014-10-17 13:57:18 +02:00
Mattes D eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
madmaxoft 16e9deba8d Added an explicit setting for allowing BungeeCord handshake. 2014-09-17 20:56:33 +02: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 64fec204c4 Added initializers for class members.
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
Mattes D 8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +02: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 2823ee9026 Revert "Only one instance of server can be started"
This reverts commit 6484e9814a.

* Fixes #1200
2014-07-20 13:49:15 +01:00
madmaxoft 08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft d52a51f7b6 Removed duplicate IPvX labels. 2014-07-18 09:18:11 +02:00
madmaxoft 2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft 7fff12bfac Fixed spaces around single-line comments.
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
Tiger Wang 1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang 4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Tiger Wang 6484e9814a Only one instance of server can be started
This disallows the UDP multicasting that the original code enabled.

xoft deterrent, in PR #1151 you implied that this was unwanted behaviour
(but comments gone now as I force pushed - check emails?).

Revert at will if unsatisfactory :P
2014-07-13 00:17:33 +01:00
madmaxoft ebea2b7efc Player data filenames are based on UUID. 2014-07-11 13:13:10 +02:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Julian Laubstein fb7f2993bf Fixed some warnings in Server.cpp, and in UI/ 2014-05-19 14:34:34 +02:00
Julian Laubstein 40ce737a7e removed the <list> include 2014-05-18 17:30:21 +02:00
Julian Laubstein cfd3c33dfa Added unload <pluginname> command 2014-05-18 17:16:02 +02:00
Julian Laubstein 19f4cd0547 Added load cmd 2014-05-17 19:39:16 +02:00
Julian Laubstein 6951b68aaf Added load command in the cServer class 2014-05-17 18:38:33 +02:00
jfhumann 4dd7610381 Declared one mutex as mutable in order to allow for const correct get accessors. 2014-04-19 17:53:02 +02:00
jfhumann 67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
daniel0916 b506a74076 Added Yggdrasil Authentication System
Code by Howaner.  Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
Tycho d904e89712 Merge branch 'Werror' into warnings
Conflicts:
	src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho 7e6ee7ef81 Fixed more Format issues 2014-03-11 14:43:14 -07:00
andrew b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Mattes D 6ad4b78a7b Merge pull request #709 from Howaner/GlobalFixes
Add 'Group not found', when the Server load the users.ini and add auto g...
2014-02-28 14:28:50 +01:00
Howaner 5b39572334 Remove old Output Finish 2014-02-21 14:56:33 +01:00
Howaner 21febaf4b3 Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini 2014-02-21 14:53:46 +01:00
madmaxoft 50bebd2dbd Disabled the leak finder. 2014-02-20 20:13:06 +01:00
STRWarrior 2a741e719c "reload" is back. 2014-02-09 00:13:25 +01:00
STRWarrior 011a334a8a Split "reload" in "reloadplugins" and "reloadgroups". 2014-02-09 00:06:37 +01:00
STRWarrior 645c096e2b The console reload command also reloads the groups. 2014-02-09 00:02:16 +01:00
madmaxoft bc6fc859f4 Protocol 1.7: Forced encryption on all connections.
This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
2014-01-28 23:53:54 +01:00
Mattes D cdcad2237a Merge pull request #587 from mc-server/mobimprovements
Mob improvements & rudimentary artificial intelligence
2014-01-25 13:36:32 -08:00
Tiger Wang 314fc3cdac Mob bugfixes
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
madmaxoft 5f34c78091 PolarSSL is fully used for 1.3.2 protocol encryption. 2014-01-23 23:35:23 +01:00
andrew 9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
madmaxoft 3c0e8c8da0 Rewritten SocketThreads for proper shutdown scenario.
This fixes #560 and #390.
2014-01-19 19:31:43 +01:00
andrew 1ad6469a18 Command blocks: Execute() 2014-01-18 16:59:33 +02:00
Tiger Wang 1d96a615b5 Fixed favicons 2014-01-07 16:53:40 +00:00
Mattes D a87daa969e Merge pull request #514 from derouinw/master
Implement favicon for 1.7.2
2014-01-07 08:41:13 -08:00
Bill Derouin 5012b81578 Avoid making copies of favicon string 2014-01-07 10:26:56 -06:00
madmaxoft 39a1bcdea0 More MSVC warning fixes. 2014-01-07 17:07:49 +01:00
Bill Derouin 1c2eb4a1c0 A few more touch ups 2014-01-07 09:49:52 -06:00
Bill Derouin ede6757f67 A few touch ups 2014-01-07 09:40:59 -06:00
Bill Derouin 913841f501 Implement favicon for 1.7.2
Favicon data is a png encoded in base64 which is stored in the server
and sent in the server response packet
2014-01-07 09:31:06 -06:00
Tycho Bickerstaff 2e113c63f9 fixxed warnings in Server.cpp 2013-12-31 09:16:42 +01:00
madmaxoft f521cbeb31 Fixed cClientHandle::Tick() being called from two threads.
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187.
2013-12-16 10:41:51 +01:00
madmaxoft 044fd237b6 Moved bindings-related to a Bindings subfolder.
Ref.: #407
2013-12-08 12:17:54 +01:00
Alexander Harkness d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Tiger Wang 3e3e63d946 Compile fix again 2013-11-26 22:45:08 +00:00
Tiger Wang f87bb1619e Fixed Linux compile again 2013-11-26 22:43:22 +00:00
Tiger Wang e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00