flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
231 Commits 1 Branch 0 Tags 92 MiB
ab95abb6bd
Commit Graph

180 Commits

Author SHA1 Message Date
faketruth
ab95abb6bd Now showing proper error messages when sockets fail :) 
Crossplatform GetLastError function in cSocket

git-svn-id: http://mc-server.googlecode.com/svn/trunk@234 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-05 16:24:16 +00:00
madmaxoft@gmail.com
d6925efab3 cSocket: added error logging to Bind() failures 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@233 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-05 15:41:56 +00:00
admin@omencraft.com
da87f9f3c1 putting default settings back to default 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@232 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-04 19:44:42 +00:00
admin@omencraft.com
debd0ea559 Fixed a bug in source/cClientHandle.h 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@231 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-04 19:40:48 +00:00
faketruth
c4abe1ed6a MCServer should be running fast again on Linux!! YAAAY!! 
It seems the intialization of MersenneTwister was really slow on Linux because it did some file reading. Doing this 200 times a tick can be pretty slow...

StringUtils didn't compile in Cygwin due to missing va_list definition

git-svn-id: http://mc-server.googlecode.com/svn/trunk@230 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-03 16:01:25 +00:00
madmaxoft@gmail.com
b8be8a4df0 cClientHandle: split packet handling into separate functions for clarity 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@229 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-03 14:33:40 +00:00
madmaxoft@gmail.com
f86d796295 cClientHandle: gotten rid of the obnoxious m_pState, now using direct members instead 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@228 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-02 21:13:24 +00:00
madmaxoft@gmail.com
dca87cd214 Socket-related assert fixes 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@227 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-02 16:13:49 +00:00
madmaxoft@gmail.com
99e8f1808c tolua: modified the binding generator to accept AString as a std::string synonym, re-generated Bindings with these settings. Lua callbacks can now safely use AString functions in C++. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@225 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-02 14:11:54 +00:00
madmaxoft@gmail.com
f1aaea5022 Removed nonsense "virtual inline" declaration from functions 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@223 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-02 12:43:30 +00:00
madmaxoft@gmail.com
865216b15a cSocket API fix (possible invalid pointer) 
cMCLogger slight change (CS ptr -> member)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@222 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-02 07:47:19 +00:00
madmaxoft@gmail.com
48d30d6ab4 Rewritten cAuthenticator to make use of the new cIsThread architecture - now authentication runs in a single separate thread for all clients; 
Global player-kicking function (cServer, cRoot);
More char * -> AString conversion

git-svn-id: http://mc-server.googlecode.com/svn/trunk@221 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 22:38:03 +00:00
faketruth
28ff03fcfe Added all current hooks to the new plugin structure. 
Converted MagicCarpet to the new plugin structure
When you fall of the MagicCarpet you teleport back up :D

git-svn-id: http://mc-server.googlecode.com/svn/trunk@220 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 19:19:51 +00:00
madmaxoft@gmail.com
cb1ce14169 AString logging fix 2 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@218 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 14:08:12 +00:00
madmaxoft@gmail.com
ef196ec22f AString logging fix 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@217 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 13:50:09 +00:00
madmaxoft@gmail.com
2568bad3cc sprintf() begone! Replaced with StringUtils' Printf() 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@216 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 13:43:47 +00:00
madmaxoft@gmail.com
d3614be2e0 Removed a few duplicate includes 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@215 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 12:46:44 +00:00
madmaxoft@gmail.com
83fc392198 new cIsThread object for thread encapsulation 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@214 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 12:25:26 +00:00
madmaxoft@gmail.com
8f5e834f41 cEvent: fixed wrong errorchecking in win32 Set() 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@213 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 09:34:15 +00:00
madmaxoft@gmail.com
35d89bc918 StringUtils: SplitString() fix 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@212 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 09:33:37 +00:00
madmaxoft@gmail.com
ced8e6f470 auto_ptr fix 2 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@211 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 09:19:21 +00:00
madmaxoft@gmail.com
bb49f0e021 Introducing StringUtils - the place to be if you are a generic string routine :) No more sprintf()! 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@209 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 09:12:54 +00:00
madmaxoft@gmail.com
3364ecc284 Fixed a sigsegv on *nix (cFile double-closing files) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@208 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 07:01:21 +00:00
faketruth
28bc14e267 Plugins can now be enabled and disabled through WebAdmin 
WebPlugins can now have spaces in their tab names

git-svn-id: http://mc-server.googlecode.com/svn/trunk@204 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-01 00:02:48 +00:00
faketruth
968f41ba51 Changed how Lua handles the (Post)Params in the HTTPRequest of a WebPlugin 
It should now be theoretically possible to upload files through WebAdmin

git-svn-id: http://mc-server.googlecode.com/svn/trunk@203 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 20:56:42 +00:00
madmaxoft@gmail.com
59e740035e Slight code cleanup, no big changes 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@202 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 18:06:24 +00:00
madmaxoft@gmail.com
14b09ee59b Another cEvent fix, I wish I could get it finally right 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@201 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 12:10:40 +00:00
madmaxoft@gmail.com
154399ccd1 Hopefully fixed pthreads in cEvent (again) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@200 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 12:09:34 +00:00
madmaxoft@gmail.com
8baa234541 cEvent class cleanup (single-event only, since multi-event wasn't used and wouldn't work on *nix anyway) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@199 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 10:45:53 +00:00
mtilden@gmail.com
16f92b2901 Linux fixes, but while it compiles, when a user joins it crashes the server with "*** glibc detected *** ./MCServer: double free or corruption (out): 0x00007fb5f5158db0 ***" 
Please look into this. Also, am I the only one compiling/using Linux?

git-svn-id: http://mc-server.googlecode.com/svn/trunk@198 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 05:37:59 +00:00
faketruth
c142424571 Can now receive POST data in WebPlugins! 
Fixed Debug With optimized Noise in VS2010 by having it run the correct MCServer_debug.exe instead of MCServer.exe
Changed winsock.h to Winsock2.h in Globals.h so sockets can be graciously closed (See webserver Socket::Close() )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@197 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-31 00:38:18 +00:00
madmaxoft@gmail.com
f4583fda98 Replaced most FILE operations with a cFile object 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@196 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-30 22:48:38 +00:00
madmaxoft@gmail.com
b834841aa1 Fixed a problem in cCSLock (sorry); reverted cChunk 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@195 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-30 21:54:40 +00:00
faketruth
9dfa0f1f15 Added a WebAdmin interface to view users their groups, and the permissions of groups. 
cChunk::Tick did an assertion in cCSLock, I used a cCSUnlock to fix it, but not sure if this is correct.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@194 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-30 16:47:26 +00:00
madmaxoft@gmail.com
51dc47bc70 More cFile cleanup; removed old format writing for block entities 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@193 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-30 16:01:45 +00:00
madmaxoft@gmail.com
7e743398a9 Initial cFile implementation (using stdio FILE) and test in cChunkMap 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@192 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-30 13:54:39 +00:00
faketruth
96da48401b Added missing #ifdef _DEBUG in cCriticalSection.cpp 
Should compile in Release and on Linux now

git-svn-id: http://mc-server.googlecode.com/svn/trunk@191 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-29 21:51:36 +00:00
madmaxoft@gmail.com
87a7c39dfc Old code begone! ChunkMap cleanup 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@189 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-29 21:40:21 +00:00
madmaxoft@gmail.com
89afb970d8 VC2008 / VC2010: Enabled precompiled header through Globals.h; the header included in every module in the project. Compilation optimization. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@188 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-29 19:28:19 +00:00
madmaxoft@gmail.com
e2ad02f50a ChunkGenerator: rewritten thread-locking using the new RAII CSLock class 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@186 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-29 14:29:26 +00:00
faketruth
1b13cc9e43 Now also compiles in Linux 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@184 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-28 16:11:37 +00:00
faketruth
de29399987 Converted entire Core plugin including WebAdmin interface to new plugin method/system/thingy and sexyfied it. 
Made some changes to WebAdmin to make the new plugins work
Old plugins still work like they're supposed to
Not all hooks have been programmed for the new plugins yet, this still needs to be done

git-svn-id: http://mc-server.googlecode.com/svn/trunk@182 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-27 23:47:32 +00:00
madmaxoft@gmail.com
86158a2d1d MSVC 2008 Express compatibility: Added the projects, modified sources to compile. Tested on MSVC 2008 Express and MSVC 2010 Express 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@179 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-27 14:04:28 +00:00
faketruth
4e8128b9d7 Converted all of the Core plugin to the new plugin structure, except for the WebAdmin part 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@175 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-26 23:10:49 +00:00
faketruth
507d9d57a9 No longer hard coded Lua files in new plugin system 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@173 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-26 22:21:23 +00:00
faketruth
4e34e438f1 Working on a new plugin design with Lua. While retaining backwards compatibility of course... 
In this new design a plugin consists of a folder with Lua files, this should enable plugin developers to keep things separate and have more overview.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@172 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-26 20:39:46 +00:00
faketruth
d8fa9c15d7 Probably fixed a deadlock! http://www.mc-server.org/support/index.php?do=details&task_id=147 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@171 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-26 13:13:44 +00:00
faketruth
ce11c6b2bd Cactus towers can be destroyed by removing the bottom block 
Added checks whether flowers/mushrooms/saplings can be placed on surface
Added checks for cactus to see if it's allowed to be placed
Fluids now wash away certain items (flower, sapling, cactus)


git-svn-id: http://mc-server.googlecode.com/svn/trunk@169 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-23 15:11:45 +00:00
faketruth
796a9e356e Fixed the  sign bug 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@168 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-22 21:22:54 +00:00
faketruth
738b1b3467 Improved Core's WebAmin interface a bit. 
Can now kick players through WebAdmin
Can now enable/disable whitelist through WebAdmin
Tick speed is limited in a better way now, instead of always sleeping 50ms before each tick, it now add only sleeps additional time when the tick time was faster than 50ms. Server should run slightly faster because of this (and use more cpu%)


git-svn-id: http://mc-server.googlecode.com/svn/trunk@167 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-01-22 20:15:11 +00:00