flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,958 Commits 1 Branch 0 Tags 92 MiB
3986059866
Commit Graph

10958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
faketruth
85ecca1cfa Converted pak files were not marked 'dirty' and wouldn't be saved. Fixed now :) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@361 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 16:15:04 +00:00
faketruth
72e18bc414 Edited the wrong settings.ini ... 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@360 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 16:09:09 +00:00
faketruth
9b7675f0e1 Forcing the use of the new redstone simulator 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@359 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 16:04:42 +00:00
faketruth
95eb3a7bd7 Should have complete support for 256 blocks high worlds. Old save files are converted to new ones at load. 
BACK UP YOUR WORLD!

git-svn-id: http://mc-server.googlecode.com/svn/trunk@358 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 15:59:10 +00:00
faketruth
f1f762c4fa The world can now truly be made higher by incrementing cChunk::c_ChunkHeight to 256. !!HOWEVER THIS WILL DESTROY YOUR SAVED WORLD!! 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@357 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 14:09:35 +00:00
faketruth
fb7c60ec11 Changed signed char to unsigned char in block packets, so we can receive height up to 255 
Blocks placed above 128 limit don't become obsidian anymore. This was due to the cChunk::MakeIndex() function return 0 when outside of bounds, it now returns an 'error constant'

git-svn-id: http://mc-server.googlecode.com/svn/trunk@356 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 13:54:33 +00:00
faketruth
ad89cf88ba Got rid of some hardcoded numbers, now using hardcoded variables! woo 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@355 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-03 20:55:16 +00:00
faketruth
f7b29dc727 That should not have been committed... 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@354 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-02 14:09:52 +00:00
faketruth
5179588b65 Chunk light and metadata are also sent now, should take a load off of the client 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@353 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-02 13:58:31 +00:00
faketruth
eceead8394 Finally got the multiblock packet working! It seems the byte order was wrong 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@352 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-02 13:41:42 +00:00
faketruth
4dda2a5c2b MultiBlock packet is working partly.. I really don't understand what's wrong with this packet :/ 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@351 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-02 01:22:06 +00:00
faketruth
a2f6ab93b6 Chunks are successfully streamed to clients (in a bad a slow way, but whatever) 
Fixed respawn packet for 1.2.2

git-svn-id: http://mc-server.googlecode.com/svn/trunk@350 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-01 18:56:56 +00:00
faketruth
d24c07a550 Clients can join the server, but chunks are sent completely empty 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@349 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-01 18:08:53 +00:00
faketruth
4baa9e2709 Forgot to update packet size (though I'm not even sure it's used anymore) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@348 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-01 17:14:23 +00:00
faketruth
957ef3b297 Started carefully moving to 1.2.2 
Clients can get up to the login packet, after which the server tries to send chunks but in the wrong format and the client disconnects

git-svn-id: http://mc-server.googlecode.com/svn/trunk@347 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-01 17:07:41 +00:00
faketruth
b467f77689 Forgot to update the VS2008 project 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@346 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-01 15:21:02 +00:00
faketruth
867fc8ee0d New redstone simulator. Should work without crashes! 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@345 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-01 15:18:59 +00:00
madmaxoft@gmail.com
93d73ac520 Fixed the authenticator bug 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@344 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-29 20:25:11 +00:00
faketruth
bba824a1c6 Making sure cClientHandle::m_Player was NULL after authentication completed 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@343 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-29 13:40:40 +00:00
madmaxoft@gmail.com
94132159be Added validity checks to world broadcasting. Also added logging to cPlayer deletion to catch that stupid BugByBoo. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@342 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-29 08:40:15 +00:00
madmaxoft@gmail.com
5d0da9a2c0 Improved threading performance by reducing thread-hopping in queue locks (cs unlocked before event set) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@341 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 16:59:59 +00:00
madmaxoft@gmail.com
a4503ddb77 Setting the m_bDestroyed flag only after the cClienthandle is truly destroyed; cClientHandle's destructor now locks loaded chunk lists 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@340 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 14:58:07 +00:00
faketruth
ac117959d3 Server uses ~40% less CPU now 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@339 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 14:22:03 +00:00
madmaxoft@gmail.com
0f88ed7c72 Linux compilation fix (y u no support const_iterator, gcc?) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@338 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 12:37:46 +00:00
madmaxoft@gmail.com
013ae71c87 Chunk now has an indicator of load failure; Chunk generator uses cChunkStay 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@337 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 12:11:14 +00:00
madmaxoft@gmail.com
230f98a774 Implemented synchronous chunk loading; optimized cChunkStay interface for speed (though still unused ;) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@336 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 10:45:53 +00:00
madmaxoft@gmail.com
bccd52530f VC2008: slight project reorganization, chunk-generation-related sources are now in one folder 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@335 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 10:07:06 +00:00
madmaxoft@gmail.com
67ffb8a1da ChunkGenerator: fixed an inverted condition on chunk-skipping when the generator is overloaded; set the overload threshold to 500 chunks (from original 50 which is not enough even for a single player) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@334 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 10:01:42 +00:00
madmaxoft@gmail.com
2c9198b208 Const-correctness for packet broadcasting (fixes GCC compilation) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@333 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-28 08:10:51 +00:00
madmaxoft@gmail.com
dee0a12029 Fix for the perpetual load issue 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@332 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-27 14:23:16 +00:00
madmaxoft@gmail.com
1f88db187b Implemented chunk loading without generating on load-failure 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@331 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-26 16:46:23 +00:00
madmaxoft@gmail.com
b902546863 New cChunkStay class for temporarily keeping chunks loaded even when then have no clients. For now unused, will be used by generator and lighting in the future. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@330 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-26 16:15:09 +00:00
madmaxoft@gmail.com
7268a70902 Attempt at fixing crashes with disconnecting players 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@329 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-26 12:55:42 +00:00
madmaxoft@gmail.com
0e33c919dd Using cSocketThreads for client outgoing packets. Unfortunately had to put in one intermediate thread (cServer::cNotifyWriteThread) to avoid deadlocks. Still, seems we have a proper multithreading for clients and no more per-client threads, yay :) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@328 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-26 00:36:51 +00:00
madmaxoft@gmail.com
a14e015354 Extended SocketThreads for writing support (unusable in cClientHandle due to too many deadlock possibilities) 
Extended the range of ignored packets in pre-game client states (fixes connection issues with some mods installed)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@327 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-25 23:48:28 +00:00
madmaxoft@gmail.com
bf19f7ae9c Made the viewdistance settable by users and default in settings.ini. The default is 9. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@326 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-23 22:51:03 +00:00
madmaxoft@gmail.com
062b38b8b0 Plain pointer cChunkPtr finishing touches; removed cChunk's critical sections 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@325 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-23 21:21:37 +00:00
madmaxoft@gmail.com
9d3b837461 Made cChunkPtr a plain old pointer again, since it's safe now 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@324 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-23 21:02:38 +00:00
madmaxoft@gmail.com
8f85b9c625 cChunk: removed unused code 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@323 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-23 11:38:10 +00:00
madmaxoft@gmail.com
4455a1643d Added cmdline parameters "/cdg" and "/cdf" for crashdump flags "globals" and "full memory" 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@322 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-23 11:37:53 +00:00
madmaxoft@gmail.com
8cfcc2915c Rewritten ore generation from scratch, using a different (much faster) algorithm. Chunk generation now about 2x faster :) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@321 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 21:20:20 +00:00
faketruth
3de5480191 That 2nd assert didn't make much sense... 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@320 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 20:40:32 +00:00
faketruth
3ca9b52ab2 Added some asserts to trace a bug 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@319 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 20:33:33 +00:00
faketruth
6015b59f13 Fixed a bug that no chunks were unloaded on the client. Now chunks are properly unloaded on the clients. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@318 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 19:31:30 +00:00
madmaxoft@gmail.com
1cb756cbf2 Noise function optimization (chunk generation now about 1.5x faster :) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@317 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 17:04:04 +00:00
madmaxoft@gmail.com
a40ed8bd0d WorldGenerator: fixed small foliage - cacti now generate only at beaches, not underwater. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@316 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 16:11:10 +00:00
faketruth
2518738f7f Updated the ChatLog plugin to the new format 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@315 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 15:57:45 +00:00
faketruth
41d55ef86b Lua seems to have trouble with a combination of overloaded functions and class inheritance, so I renamed TeleportTo( cEntity* ) to TeleportToEntity 
/tp command should work again :)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@314 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 15:46:38 +00:00
madmaxoft@gmail.com
1d1b0fd00d Fixed a potential deadlock in cChunkMap::m_CSLayers vs cWorld::m_CSAllEntities 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@313 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 15:45:00 +00:00
faketruth
d9c25a161e Added a crude way of disabling redstone. It's necessary though, redstone is completely broken, crashes the server all the time 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@312 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-02-22 15:35:10 +00:00