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

10193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
faketruth
f90a8928e7 Completely integrated the new axis ordering. Will update worlds accordingly 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@396 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 22:10:15 +00:00
madmaxoft@gmail.com
4004129e11 Anvil support: compatible with both chunk orderings 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@395 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 21:42:18 +00:00
madmaxoft@gmail.com
e7731242c1 Using references instead of pointers for sending packets 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@394 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 21:34:47 +00:00
madmaxoft@gmail.com
732b7349fa Fixed mob spawn packet for 1.2 client, now client doesn't bail out when mobs are turned on 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@393 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 19:30:06 +00:00
madmaxoft@gmail.com
1a5ebb44aa Fixed *nix threading issue; 
Thread objects now use variable names consistent with MCS convention;
Fixed a few *nix threading cornercases

git-svn-id: http://mc-server.googlecode.com/svn/trunk@392 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 17:37:00 +00:00
faketruth
e5b91a8d97 Was using "#else if" which is not valid apparently, now using "#elif" 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@391 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 13:49:40 +00:00
faketruth
68f3ea56bd You can change axis ordering by setting AXIS_ORDER to AXIS_ORDER_XZY in cChunk.h !THIS WILL SCREW UP YOUR WORLDS THOUGH! 
Still need to update world storage schemes, converters and such

git-svn-id: http://mc-server.googlecode.com/svn/trunk@390 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 02:39:36 +00:00
faketruth
62ba8f5a20 Using more of the index functions in cChunk, so it should be easy enough to flip the axis ordering now 
Added some more functions that use Vector3i for block coordinates in cChunk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@389 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-10 00:25:05 +00:00
faketruth
f43b65cf53 cClientHandles have a unique ID now to distinguish them 
cAuthenticator uses unique client ID for authentication
Changed the kick function used by cAuthenticator to take a client ID instead of name, so the correct user is kicked
Using callback reference instead of pointer in GetChunkData and affiliates
GetChunkData returns false when failed, and true when succeeded
Renamed entity type enums to something prettier
Exposed some functions to Lua

git-svn-id: http://mc-server.googlecode.com/svn/trunk@388 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-09 13:42:28 +00:00
madmaxoft@gmail.com
11810e05e4 Using the _DEBUG macro for *nix debug builds as well; trying to force 8-byte alignment on critical sections ( http://forum.mc-server.org/showthread.php?tid=384 ) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@387 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-09 09:39:48 +00:00
madmaxoft@gmail.com
effe9647cc Added NBT example dumps for reference 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@386 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 22:10:36 +00:00
madmaxoft@gmail.com
7219e74c7c Anvil format: loading chests' contents. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@385 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 22:09:55 +00:00
madmaxoft@gmail.com
4544d5d3b9 ChunkSender: Fixed a potential crash: removing a client means that no Send() is called on that client anymore 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@384 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 20:06:18 +00:00
madmaxoft@gmail.com
0cee2428c1 WSSCompact: fixed switched version values (!); removed unused methods 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@383 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 20:03:44 +00:00
faketruth
787382caf8 Fixed bug where cPlayer's cClientHandle was used after cPlayer was destroyed http://forum.mc-server.org/showthread.php?tid=380 
Also removed the SetClientHandle() function from cPlayer
Added a Destroyed() function to cEntity that is called ONLY ONCE after an entity has been 'destroyed'
Cleaned up some code, using enums for GameMode and Weather and replaced some 'const char *' with 'const AString &'
Exposed some more functions to Lua

git-svn-id: http://mc-server.googlecode.com/svn/trunk@382 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 13:36:30 +00:00
madmaxoft@gmail.com
d63b092e02 No need to reset zlib (copypasta error) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@381 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 11:31:54 +00:00
madmaxoft@gmail.com
69a4ee5383 Added the Anvil level format (MCA) support, read-only for the time being. Now MCS can read your worlds from the official server :) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@380 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-07 11:28:24 +00:00
faketruth
bae54ee7bd Sticky pistons should work as well now 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@379 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 22:17:36 +00:00
madmaxoft@gmail.com
b20fa171a4 Added a little documentation on ChunkSender. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@378 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 21:58:32 +00:00
faketruth
944dec3a4e Fixed redstone repeater bug where it could not get the direction when it has delay bits set 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@377 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 21:56:12 +00:00
madmaxoft@gmail.com
3d0eced7e7 ChunkSender won't send NULL packets anymore 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@376 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 21:48:45 +00:00
madmaxoft@gmail.com
7ee0667b75 Fixed rev 373 not compiling on linux 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@375 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 21:32:22 +00:00
faketruth
01577bed9d Yay redstone repeaters! 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@374 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 21:06:51 +00:00
madmaxoft@gmail.com
5e4e89b6ee World storage names are now case-INsensitive 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@373 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 19:40:05 +00:00
madmaxoft@gmail.com
e463ddc500 That was not a good place to use ARRAYCOUNT() 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@372 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 14:54:31 +00:00
madmaxoft@gmail.com
8cdd63f06c Fixed rev368's ChunkSender, now sends properly even chunks that are loaded. Fixed a deadlock in cClientHandle vs TickThread over cClientHandle::m_CSChunkLists 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@371 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 14:52:44 +00:00
faketruth
ea1ecd36db Fixed bug FS#157 http://mc-server.org/support/index.php?do=details&task_id=157 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@370 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-06 13:25:14 +00:00
madmaxoft@gmail.com
0df305e226 Fixed a potential deadlock ( http://forum.mc-server.org/showthread.php?tid=374 ) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@369 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-05 17:15:56 +00:00
madmaxoft@gmail.com
e4043be593 Using a fixed-size array instead of AString for conversion. Conversion now runs ~10x faster :) (in debug mode) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@368 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-05 17:00:35 +00:00
madmaxoft@gmail.com
0633c2440b Added a recommended post-commit hook script for Windows clients 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@367 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-05 16:45:20 +00:00
madmaxoft@gmail.com
01c5d6e128 WSS conversion quickfix: reserving memory so that AString doesn't need to re-alloc (but still uses painfully slow push_back()s ) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@366 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-05 16:43:06 +00:00
madmaxoft@gmail.com
4d65ffffc0 ChunkSender: Chunks are now compressed and sent to clients from a separate threads, proper passive waiting between threads. Not much tested, just appears to work :) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@365 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-05 16:41:57 +00:00
faketruth
a655d7fdae Removed redstone debugging: powered dirt blocks change into stone 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@364 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 16:59:39 +00:00
faketruth
ac5f1e8f30 Yay tiny commits XD fixed % sign 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@363 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 16:19:49 +00:00
faketruth
e1b9fb1ab4 Lowered the amount of logging while converting chunks 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@362 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-03-04 16:18:32 +00:00
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