1
0
Commit Graph

38 Commits

Author SHA1 Message Date
madmaxoft
a7d44d69dd Authenticator doesn't save the ini file.
Didn't load it -> shouldn't save it.
2013-10-27 09:09:39 +01:00
madmaxoft
f032a2ff74 Merge branch 'origin/LoadWorlds/cAuthenticatorINI' 2013-10-27 09:04:39 +01:00
STRWarrior
cb06f35cb8 Changed "cIniFile IniFile" to cIniFile & IniFile" 2013-10-26 19:47:12 +02:00
STRWarrior
77661f4c59 Both the LoadWorlds() function and cAuthenticator now use the cIniFile object from the Root::Start() function. 2013-10-26 17:08:28 +02:00
madmaxoft
9e9198e090 cIniFile doesn't store filename internally anymore. 2013-10-25 11:15:44 +02:00
madmaxoft
e6bb025a9f Fixed webadmin logging.
This fixes #262.
2013-10-18 12:50:50 +02:00
madmaxoft
a120507be0 Implemented the two memory-statistics functions in cRoot.
This fixes #185. cWebAdmin::GetMemoryUsage() is accessible but deprecated (with a warning output to the screen).
2013-10-08 20:12:34 +02:00
Mattes D
e3ba3b8f97 Merge pull request #208 from mc-server/NewWebServer
New web server
2013-10-07 13:19:14 -07:00
madmaxoft
68605b6dce Fixed startup timings on server restart. 2013-10-07 10:46:35 +02:00
madmaxoft
dabbf24f58 Merge branch 'master' into NewWebServer
This should simplify merging
2013-10-06 15:44:14 +02:00
madmaxoft
b5c90d7b20 WebAdmin uses the new HTTP functionality.
This is a partial implementation of #183.
2013-10-05 23:08:16 +02:00
Tiger Wang
20902e125c Removed unneeded statement
Also LOGINFO'd "Starting WebAdmin"
2013-09-30 21:17:52 +01:00
Tiger Wang
9c7cfd29ad Improvements to startup timer
As suggested by xoft. Also reverted changes of displayed protocol
version.
2013-09-29 21:37:50 +01:00
Tiger Wang
cc5c56d545 Minor startup streamlining
* LOGD'd unneeded debugging messages, streamlining startup
+ Added a basic timer for how long in seconds it took to start up
+ Added two checks for plural (plugin/s, second/s)
2013-09-28 20:36:01 +01:00
madmaxoft
f4efcb9080 Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes. 2013-09-27 18:14:26 +02:00
madmaxoft
11e0c73ffd Implemented basic HTTP message header parsing. 2013-09-24 20:52:37 +02:00
madmaxoft
1a7912744f Moved entities into the Entities subfolder. 2013-08-19 11:39:13 +02:00
madmaxoft
d287183137 Added cRoot:BroadcastChat() to the Lua API.
This allows plugins to broadcast a chat message to all connected players. It is a replacement for previously removed cServer:BroadcastChat().
2013-08-17 23:58:37 +02:00
madmaxoft
50205bc4df Added simple deadlock detection code.
This will assert and then deliberately crash the server once a deadlock is detected. For detection, only the world tick threads are considered, cWorld's m_WorldAge is checked periodically and if it doesn't increment for several seconds, a deadlock is reported.
2013-08-14 22:39:12 +02:00
madmaxoft
4c5590636c Each world now ticks in a separate thread. 2013-08-11 20:16:41 +02:00
madmaxoft
09ebda4d10 Removed Squirrel.
This compiles under Windows, but is untested in Linux.
2013-08-07 22:39:40 +02:00
madmaxoft
ca5561c395 cIniFile now reads .example.ini if not requested not to.
As specified in #44, when the .ini file cannot be opened, a .example.ini is tried, and if it succeeds, it is written as .ini. This makes it easy to provide ini file templates.
2013-08-05 15:24:23 +02:00
madmaxoft@gmail.com
df34c43293 Server shuts down when the stdin is closed (linux Ctrl+D / win Ctrl+Z)
Fixes FS #419

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1679 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-24 20:25:27 +00:00
madmaxoft@gmail.com
7b75aaea7c Advanced RCON: Command output is sent to the RCON client.
RCON authentication is now required before executing commands.
Console command handlers now return two values, bool (IsHandled) and string (CommandOutput).
API change: removed cRoot:ExecuteConsoleCommand(), added cRoot:QueueExecuteConsoleCommand().
API change: removed cPluginManager:ExecuteConsoleCommand(), use cRoot:QueueExecuteConsoleCommand() instead

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1631 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-29 15:30:05 +00:00
madmaxoft@gmail.com
384e6603c4 Fixed server stopping after #363 fix
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1422 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-27 21:14:31 +00:00
madmaxoft@gmail.com
8418c7ba9a Fixed a deadlock
FS #363

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1421 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-27 21:05:34 +00:00
madmaxoft@gmail.com
28d8d8419a Moved client socket accepting into a separate thread object, cListenThread
MCServer can now listen on multiple ports
FS #312

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1252 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-04 21:13:08 +00:00
madmaxoft@gmail.com
34b3c13404 Plugins can now bind console commands
FS #300
Most console commands are now implemented in the Core plugin.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1214 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-15 13:00:59 +00:00
madmaxoft@gmail.com
dedb414a50 Added new hooks: OnChunkAvailable(), OnChunkUnloaded() and OnChunkUnloading(). Modified OnChunkGenerated() signature.
http://forum.mc-server.org/showthread.php?tid=464&pid=6312#pid6312

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1193 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-05 19:57:22 +00:00
faketruth
8ad7747902 Android: Made the initial pre-calculated spawn area smaller
Android: Fixed FastNBT
Android: Fixed level.dat reading/writing
GroupManager uses groups.example.ini as default
WebAdmin uses webadmin.example.ini as default

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1049 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-16 22:06:12 +00:00
madmaxoft@gmail.com
b65a22fc1f Fixed boolean comparison.
Don't compare booleans to false / true, use them directly.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1048 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-16 16:03:56 +00:00
madmaxoft@gmail.com
f46d4bd561 Settings.ini is read only once on server start
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1035 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-11 14:23:47 +00:00
madmaxoft@gmail.com
83b949f490 PrimaryServerVersion is not force-saved into settings.ini.
Server admins are advised to keep the value undefined, which will default in the latest supported version being the primary

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1034 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-11 14:15:59 +00:00
faketruth
727446f6d5 Made settings.ini default to settings.example.ini when it doesn't exist
I suggest to do the same with the other ini files?

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1030 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-10 15:13:09 +00:00
madmaxoft@gmail.com
08a20492ef Added the [Server].PrimaryServerVersion setting to settings.ini; 1.4.2 gets the correct version
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1018 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-31 19:54:42 +00:00
madmaxoft@gmail.com
28332c6567 Completely removed the old (buggy) redstone simulator.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@937 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-06 20:04:58 +00:00
madmaxoft@gmail.com
4df23d19b7 Unified folder name-casing
git-svn-id: http://mc-server.googlecode.com/svn/trunk@902 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29 13:59:32 +00:00
madmaxoft@gmail.com
ecfe6ab65b Source files cleanup: The rest of the files renamed.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-23 22:09:57 +00:00