flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
763 Commits 1 Branch 0 Tags 92 MiB
476748ac8b
Commit Graph

626 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
46904e1820 Now it's possible to only show the plugin's WebAdmin content without the template around it by going to /~webadmin/ instead of /webadmin/ 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@772 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-21 22:17:59 +00:00
madmaxoft@gmail.com
674fe1e955 Window, Chest, Furnace and Pawn are not using cPackets at all 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@762 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 21:14:45 +00:00
madmaxoft@gmail.com
427e582d5f Almost all packets' handling is now rewritten not to use cPacket descendants elsewhere than in cClientHandle. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@761 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 19:42:32 +00:00
faketruth
5b36aa1567 Android: Do not create an input thread for Android 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@760 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 16:57:22 +00:00
madmaxoft@gmail.com
eb3ed1aec1 Another handful of packets rewritten. 
Also changed cItem::m_ItemID into m_ItemType of type short. Easier handling. m_ItemID kept for compatibility reasons (Lua-interface etc.)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@756 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 11:51:17 +00:00
lapayo94@gmail.com
f6ae6002c3 Fixed Bug #236 
Workbench, Chest and Furnace are usable again

git-svn-id: http://mc-server.googlecode.com/svn/trunk@755 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 10:44:19 +00:00
faketruth
cc13cbbe3d Android: Showing last MCServer related logcat message 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-18 23:42:27 +00:00
madmaxoft@gmail.com
1b5eaa92b5 Chat packet handled in the new way; fixed missing packet sending for inventory slot. 
Again, API change! cPlugin:OnChat() has had its parameters swapped, to match all the other callbacks - Player first, Message second

git-svn-id: http://mc-server.googlecode.com/svn/trunk@751 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-18 10:38:15 +00:00
madmaxoft@gmail.com
2691e8daed Packet refactoring, phase two, partial. Rewritten a few packet handling functions not to use cPacket-descendant objects. 
This breaks plugin API! Plugins need to modify their hook functions to match those used in the Core plugin

git-svn-id: http://mc-server.googlecode.com/svn/trunk@750 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-18 09:56:28 +00:00
faketruth
c40af4c4ab Android: Pressing back button sends stop command to server 
Android: ToJava can call functions on Java by using JNI
Android: Plugins work
Android: Added android specific files to VS2008 project, but they are excluded from compiling

git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-17 22:20:35 +00:00
madmaxoft@gmail.com
1f42ef9a1e Fixed an assert in bucket placement 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@746 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-17 10:54:13 +00:00
madmaxoft@gmail.com
70a4ca5bc1 Packets now parse themselves from a cByteBuffer object (1st part of packeting rewrite, http://forum.mc-server.org/showthread.php?tid=524 ) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@744 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-17 10:18:07 +00:00
faketruth
33ca4d5003 MCServer should run just fine on Android now :D 
The server is also stoppable from Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-16 20:28:14 +00:00
madmaxoft@gmail.com
1c4c0b5698 Windows compilation fix after Android changes 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@742 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-16 06:47:09 +00:00
faketruth
d21e4dacf7 Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! 
Disabled Squirrel for Android
cLog now logs to Android LogCat as well
Fixed Lua so it compiles on Android
Removed/commented out exceptions in JsonCpp so it compiles on Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-15 21:24:11 +00:00
madmaxoft@gmail.com
5bc07ba743 Added temporary debug statistics of the RelEntMoveLook packet removal efficiency 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@740 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-15 20:37:08 +00:00
madmaxoft@gmail.com
16dda8e037 Console command "chunkstats" now lists each world and also totals 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@739 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-15 12:08:11 +00:00
madmaxoft@gmail.com
b687be9e44 Added a true "all chunks saved" message for the save-all console command (FS #215) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@738 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-15 11:54:13 +00:00
madmaxoft@gmail.com
d58db08c1b Fix torches broken in rev 724 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@737 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-14 15:53:05 +00:00