1
0
Commit Graph

772 Commits

Author SHA1 Message Date
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
madmaxoft@gmail.com
17253d2c90 Turned a common assert into a warning log
git-svn-id: http://mc-server.googlecode.com/svn/trunk@794 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 20:50:12 +00:00
madmaxoft@gmail.com
6ad8553a3a Added basic noteblocks, finished sign storage in Anvil (patch contributed by l0udPL)
http://forum.mc-server.org/showthread.php?tid=528

git-svn-id: http://mc-server.googlecode.com/svn/trunk@793 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 17:50:42 +00:00
madmaxoft@gmail.com
c00db32b78 Removed old makefile; use GNUmakefile instead
git-svn-id: http://mc-server.googlecode.com/svn/trunk@792 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 17:42:52 +00:00
madmaxoft@gmail.com
a83420491f Fixed compilation problem on Linux (FS case sensitivity sux)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@791 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 16:20:08 +00:00
madmaxoft@gmail.com
7cf9ddaa48 cSocket doesn't use cPackets.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@790 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-25 21:59:13 +00:00
madmaxoft@gmail.com
7157ebc061 cWorld doesn't use cPackets.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@789 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-25 21:46:18 +00:00
madmaxoft@gmail.com
bb25ba4977 Removed cPackets from cChunk.
Also decoupled a possible deadlock in player login code.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@788 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-25 17:52:08 +00:00
madmaxoft@gmail.com
2c5f9350d6 Removed packet includes where they're not needed
git-svn-id: http://mc-server.googlecode.com/svn/trunk@787 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 09:50:13 +00:00
madmaxoft@gmail.com
f0fc0edd21 cPickup doesn't use cPackets.
Also, Lua API change, OnCollectItem -> OnCollectPickup; first param is cPlayer to match other callbacks.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@786 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 09:49:00 +00:00
madmaxoft@gmail.com
0c5910c4fb Ignore some runtime folders
git-svn-id: http://mc-server.googlecode.com/svn/trunk@785 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 08:05:52 +00:00
madmaxoft@gmail.com
530be5bd66 Inventory doesn't use cPackets
git-svn-id: http://mc-server.googlecode.com/svn/trunk@784 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 08:04:58 +00:00
madmaxoft@gmail.com
e92b9e7ecb Monster classes don't use cPackets. Chat messages are sent / broadcast without cPackets. BlockEntities don't use cPackets.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@783 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-24 07:58:26 +00:00
madmaxoft@gmail.com
263ce31bd6 Added plugin name to deprecation messages
Removed duplicate inheritance of m_Name in cPlugin_NewLua by making cWebPlugin interface-only

git-svn-id: http://mc-server.googlecode.com/svn/trunk@782 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-23 20:49:21 +00:00
lapayo94@gmail.com
a39adadd0f Fixed Bug #237
Sign placement

git-svn-id: http://mc-server.googlecode.com/svn/trunk@781 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-23 20:41:48 +00:00
faketruth
eba0437d68 Fixed WebAdmin showing tab names (thanks for pointing it out Lapayo)
Changed some std::string to AString

git-svn-id: http://mc-server.googlecode.com/svn/trunk@780 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 23:29:15 +00:00
faketruth
49a4613d94 Added a RateCompareString function to StringUtils
Created a preprocessor template (define) for DoWith* functions
Exported cWorld::FindAndDoWithPlayer(), cRoot::FindAndDoWithPlayer() and cRoot::ForEachPlayer() to Lua
Added a function FindAndDoWithPlayer to cRoot and cWorld. It takes a part of a player name and finds a single player based on that.
Fixed Core's MOTD to contain the correct URL to the MCServer site
Fixed Core /kick command
Fixed Core's WebAdmin kick

git-svn-id: http://mc-server.googlecode.com/svn/trunk@779 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 23:05:12 +00:00
lapayo94@gmail.com
886c7f5624 Added a documentation for block and item handlers
Probably fixed dependencies on cWebPlugin_Lua
Fixed VC2010 Project file

git-svn-id: http://mc-server.googlecode.com/svn/trunk@778 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 16:31:13 +00:00
faketruth
7c84349990 WebAdmin should not cause crashes anymore
Got rid of cWebPlugin_Lua
cPlugin_Lua is also a cWebPlugin now, so plugins don't need a separate cWebPlugin object
Changed some stuff to use AString instead of char*

git-svn-id: http://mc-server.googlecode.com/svn/trunk@777 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 14:22:21 +00:00
faketruth
0da4f7eaa2 Fixed cWebPlugin_Lua being not thread safe. And I don't know why, but it still crashes in Lua sometimes o_O
WebAdmin chat now supports infinite number of chat messages (only client side). The client requests only NEW chat messages from the server.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@776 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 12:24:29 +00:00
faketruth
e086b931ea Chat history limit on the WebAdmin chat
Did some refactoring on the JavaScript side of the WebAdmin chat
Got rid of cRoot::sRootState
Fixed a crash on the WebAdmin when a page is loaded before a world exists

git-svn-id: http://mc-server.googlecode.com/svn/trunk@775 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 11:22:26 +00:00
faketruth
492cbe87ee Now the web server supports %20 spaces in URLs
git-svn-id: http://mc-server.googlecode.com/svn/trunk@774 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 10:16:57 +00:00
faketruth
b5c4994475 Web chat for the WebAdmin :D
git-svn-id: http://mc-server.googlecode.com/svn/trunk@773 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 00:35:06 +00:00