1
0
Commit Graph

794 Commits

Author SHA1 Message Date
madmaxoft@gmail.com
81e7eca286 Fixed profiling to work under the new project layout
git-svn-id: http://mc-server.googlecode.com/svn/trunk@844 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-07 16:40:05 +00:00
madmaxoft@gmail.com
4a3b5e93ec Snow is not put atop vines by the snow finisher anymore
git-svn-id: http://mc-server.googlecode.com/svn/trunk@843 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-07 16:05:10 +00:00
madmaxoft@gmail.com
c3f82c53db Fixed slot parsing in 1.2.5 causing weird behavior ( http://forum.mc-server.org/showthread.php?tid=551&pid=4413#pid4413 )
Also added some asserts into ByteBuffer so that this won't happen again.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@842 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-06 18:17:47 +00:00
madmaxoft@gmail.com
0ba2be666f Added protocol-specific authentication, now works for both 1.2.5 and 1.3.2
git-svn-id: http://mc-server.googlecode.com/svn/trunk@841 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-06 17:36:59 +00:00
madmaxoft@gmail.com
d75bdabc90 Removed excessive debug logging in cProtocol132
git-svn-id: http://mc-server.googlecode.com/svn/trunk@840 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-06 16:22:08 +00:00
madmaxoft@gmail.com
879806e5a1 Officially added 1.3.2 protocol support
git-svn-id: http://mc-server.googlecode.com/svn/trunk@839 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-06 12:39:07 +00:00
madmaxoft@gmail.com
9696aa242c ProtoProxy: Added blockchange packet parsing
git-svn-id: http://mc-server.googlecode.com/svn/trunk@838 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-06 08:34:08 +00:00
madmaxoft@gmail.com
1135b6742f ClientHandle: added an overflow buffer for outgoing data, it fixes the "bad packet id" problem with 1.3.2.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@837 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-06 08:33:43 +00:00
faketruth
f94456dd3e Added the possibility of reserved player slots by implementing the HandleHandshake hook!
More info: http://forum.mc-server.org/showthread.php?tid=555

git-svn-id: http://mc-server.googlecode.com/svn/trunk@836 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-05 20:30:27 +00:00
madmaxoft@gmail.com
692afbca68 ProtoProxy: Added about 10 new packet types parsed
git-svn-id: http://mc-server.googlecode.com/svn/trunk@835 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-05 19:06:40 +00:00
madmaxoft@gmail.com
d50f30c3c4 ProtoProxy: Parsing some initial packets early in the conversation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@834 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 20:21:23 +00:00
madmaxoft@gmail.com
5e5b87a187 Debugging in cByteBuffer::Write(); added the ReadAgain() method to allow ProtoProxy re-send the data it has parsed.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@833 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 19:06:46 +00:00
madmaxoft@gmail.com
e3d5da2409 Fixed a possible race condition in cClientHandle's packet sending code; prepared for moving cSocket out of cClientHandle's ownership.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@832 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 19:05:35 +00:00
madmaxoft@gmail.com
b379f35f4f Fixed preprocessor definitions in Linux
git-svn-id: http://mc-server.googlecode.com/svn/trunk@831 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 15:29:45 +00:00
madmaxoft@gmail.com
58b1b3160d Fixed FS #243, server crash after restart. The blockhandler table and the itemhandler table weren't properly re-initialized.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@830 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 15:07:08 +00:00
madmaxoft@gmail.com
c2288fce98 Fixed a typo in PDB packlist
git-svn-id: http://mc-server.googlecode.com/svn/trunk@829 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 10:37:31 +00:00
madmaxoft@gmail.com
2b46f67712 Hopefully fixed pointer arithmetic problems in GCC compilation in cProtocol132
git-svn-id: http://mc-server.googlecode.com/svn/trunk@828 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 10:21:03 +00:00
madmaxoft@gmail.com
49f6828834 Removed OS dependencies from CryptoPP; Removed unused modules that didn't compile on some platforms
git-svn-id: http://mc-server.googlecode.com/svn/trunk@827 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 10:17:27 +00:00
madmaxoft@gmail.com
532ed91a72 Protocol proxy now decrypts the data (but doesn't understand the packets yet)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@826 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 21:38:13 +00:00
madmaxoft@gmail.com
38efe73154 Added writing support to cByteBuffer (will be used by ProtoProxy)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@825 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 19:38:37 +00:00
lapayo94@gmail.com
5042944d9a Fixed Bug #241:
Torches should drop correct now

git-svn-id: http://mc-server.googlecode.com/svn/trunk@824 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 18:15:50 +00:00
madmaxoft@gmail.com
51b3d28cee Fixed debug-only code leaking into release mode in cCriticalSection, making it incompilable in release mode.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@823 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 15:40:39 +00:00
madmaxoft@gmail.com
e1c83be32d ProtoProxy: Initial import of the protocol proxy project.
Currently it logs all communication, doesn't decode anything, doesn't decrypt.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@822 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 15:38:28 +00:00
faketruth
f075bed23c ToLua does not like the override keyword :(
git-svn-id: http://mc-server.googlecode.com/svn/trunk@821 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 13:54:33 +00:00
faketruth
9db307bb53 Exported cWorld::DoWithChestAt to Lua
Exported cChestEntity to Lua for handling in DoWithChestAt

git-svn-id: http://mc-server.googlecode.com/svn/trunk@820 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 13:34:59 +00:00
madmaxoft@gmail.com
c7d5c00a17 Next iteration on the 1.3.2 protocol. Still no good, but sometimes it just gets through. For your testing pleasures ;)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@819 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 12:09:58 +00:00
madmaxoft@gmail.com
926903905b Added a CreateHexDump() function for easier raw data debugging
git-svn-id: http://mc-server.googlecode.com/svn/trunk@818 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-02 09:04:11 +00:00
madmaxoft@gmail.com
b229560132 Critical sectino now allows debug info - is it locked? / is it locked by current thread?
Useful for ASSERTs

git-svn-id: http://mc-server.googlecode.com/svn/trunk@817 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-01 22:32:11 +00:00
madmaxoft@gmail.com
65cc040971 Fix for Rev 814, the correct cPlayer object is actually sent into the callbacks.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@816 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-01 21:44:18 +00:00
madmaxoft@gmail.com
79a9c8cf1c Quick fix for generator crash upon server stop.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@815 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-01 21:37:41 +00:00
madmaxoft@gmail.com
63bd1976cc Added a Player parameter to OnUpdatedSign and OnUpdatingSign Lua callbacks and to the cWorld:UpdateSign method (http://forum.mc-server.org/showthread.php?tid=464&pid=4393#pid4393)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@814 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-01 21:31:20 +00:00
lapayo94@gmail.com
476748ac8b Implemented: http://www.mc-server.org/support/index.php?do=details&task_id=239&project=2&dev=26
Fixed Bug on build collision

git-svn-id: http://mc-server.googlecode.com/svn/trunk@813 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-01 21:21:17 +00:00
madmaxoft@gmail.com
7824ce9d63 Progress on the 1.3.2 protocol.
Sometimes the client lets the player through, but most of the times the connection breaks for no apparent reason.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@812 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-31 21:59:57 +00:00
madmaxoft@gmail.com
c3fd0bf1a5 Fix for the nightbuild script packing the wrong PDBs
git-svn-id: http://mc-server.googlecode.com/svn/trunk@811 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-31 16:42:14 +00:00
madmaxoft@gmail.com
acc4be8034 Another possible deadlock in cClientHandle averted. Hope this is the one.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@810 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-31 16:26:03 +00:00
madmaxoft@gmail.com
f8b2cd99a6 Fixed one possibility of a deadlock in cClientHandle::SendChunkData()
git-svn-id: http://mc-server.googlecode.com/svn/trunk@809 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-31 11:40:54 +00:00
madmaxoft@gmail.com
539364846a Implemented 1.3.2 protocol encryption using CryptoPP, up to Client Status packet (http://wiki.vg/Protocol_FAQ step 14)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@808 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 21:06:13 +00:00
tau.tihon@gmail.com
d5f8701f63 Updated to V6 - "Stop" and "Progress report" functionality
git-svn-id: http://mc-server.googlecode.com/svn/trunk@807 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 15:54:51 +00:00
madmaxoft@gmail.com
d2469d857a ChunkWorx: fixed API change breaking exact and 3x3 playerpos regeneration (fix contributed by Taugeshtu)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@806 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 12:37:55 +00:00
madmaxoft@gmail.com
f5fe723b2a Added a basic protocol recognizer and the base for 1.3.2 protocol.
Also fixed a few type-related warnings.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@805 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 09:56:59 +00:00
madmaxoft@gmail.com
fa93c0cf54 cProtocol handles the initial handshake up to player login
git-svn-id: http://mc-server.googlecode.com/svn/trunk@804 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 08:19:19 +00:00
madmaxoft@gmail.com
658383edf8 Fixed the VC2010 project file
git-svn-id: http://mc-server.googlecode.com/svn/trunk@803 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 08:18:31 +00:00
madmaxoft@gmail.com
f1d62b77cd Gotten completely rid of all cPackets. The cProtocol125 class now does all the parsing and writing by itself.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@802 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-29 21:02:39 +00:00
madmaxoft@gmail.com
1733ebf4cd Added a check if torch is placed on the bottom face, temporarily fix the assert.
Server ignores the placement, but doesn't send correct block to the client. Also, the server should try placing the torch on a side, if available.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@801 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-29 20:40:08 +00:00
madmaxoft@gmail.com
1651fcd980 Moved all packet-serializing code into cProtocol125; half the packet classes aren't needed anymore.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@800 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-28 21:59:49 +00:00
madmaxoft@gmail.com
0425d8c8a5 Fixed a few warnings
git-svn-id: http://mc-server.googlecode.com/svn/trunk@799 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-28 21:58:33 +00:00
madmaxoft@gmail.com
4abaf24131 Removed false positives in leakfinder for webserver - by using raw char arrays instead of std::string for const data.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@798 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-28 12:39:28 +00:00
madmaxoft@gmail.com
66300ea7a6 Added the ChunkWorx plugin to SVN (contributed by Taugeshtu)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@797 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-27 19:06:11 +00:00
madmaxoft@gmail.com
66f4c9e0c0 Cut out all packet handling to a separate cProtocol descendant
git-svn-id: http://mc-server.googlecode.com/svn/trunk@796 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-27 17:31:16 +00:00
madmaxoft@gmail.com
d97ad781b4 git-svn-id: http://mc-server.googlecode.com/svn/trunk@795 0a769ca7-a7f5-676a-18bf-c427514a06d6 2012-08-26 21:01:07 +00:00