Merge branch 'master' into Inventory

.gitignore

@@ -3,6 +3,7 @@ nbproject/
 ipch/
 Win32/
 MCServer/MCServer
+MCServer/itemblacklist
 ChunkWorxSave.ini
 doxy/
 Profiling

.gitmodules

@@ -25,3 +25,6 @@
 [submodule "lib/SQLiteCpp"]
 	path = lib/SQLiteCpp
 	url = https://github.com/mc-server/SQLiteCpp.git
+[submodule "lib/libevent"]
+	path = lib/libevent
+	url = https://github.com/mc-server/libevent.git

.travis.yml

@@ -13,6 +13,9 @@ before_install:
 install:
   # g++4.8 and clang
   - sudo apt-get install -qq g++-4.8
+
+  # lua, needed for style checking and possibly later on for bindings generation
+  - sudo apt-get install -qq lua5.1
 
   # g++4.8
   - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi

CIbuild.sh

@@ -7,6 +7,9 @@ export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
 export MCSERVER_BUILD_DATETIME=`date`
 
 cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
+cd src
+lua CheckBasicStyle.lua
+cd ..
 make -j 2;
 make -j 2 test;
 cd MCServer/;

CMakeLists.txt

@@ -95,6 +95,24 @@ set(SQLITECPP_BUILD_EXAMPLES  OFF CACHE BOOL "Build examples."
 set(SQLITECPP_BUILD_TESTS     OFF CACHE BOOL "Build and run tests."                            FORCE)
 set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to the project." FORCE)
 
+# Set options for LibEvent, disable all their tests and benchmarks:
+set(EVENT__DISABLE_OPENSSL   YES CACHE BOOL "Disable OpenSSL in LibEvent"       FORCE)
+set(EVENT__DISABLE_BENCHMARK YES CACHE BOOL "Disable LibEvent benchmarks"       FORCE)
+set(EVENT__DISABLE_TESTS     YES CACHE BOOL "Disable LibEvent tests"            FORCE)
+set(EVENT__DISABLE_REGRESS   YES CACHE BOOL "Disable LibEvent regression tests" FORCE)
+set(EVENT__DISABLE_SAMPLES   YES CACHE BOOL "Disable LibEvent samples"          FORCE)
+
+# Check that the libraries are present:
+if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/SQLiteCpp/CMakeLists.txt)
+	message(FATAL_ERROR "SQLiteCpp is missing in folder lib/SQLiteCpp. Have you initialized the submodules / downloaded the extra libraries?")
+endif()
+if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/polarssl/CMakeLists.txt)
+	message(FATAL_ERROR "PolarSSL is missing in folder lib/polarssl. Have you initialized the submodules / downloaded the extra libraries?")
+endif()
+if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/libevent/CMakeLists.txt)
+	message(FATAL_ERROR "LibEvent is missing in folder lib/libevent. Have you initialized and updated the submodules / downloaded the extra libraries?")
+endif()
+
 # Include all the libraries:
 add_subdirectory(lib/jsoncpp/)
 add_subdirectory(lib/zlib/)
@@ -104,27 +122,32 @@ add_subdirectory(lib/sqlite/)
 add_subdirectory(lib/SQLiteCpp/)
 add_subdirectory(lib/expat/)
 add_subdirectory(lib/luaexpat/)
+add_subdirectory(lib/libevent/)
 
 # Add proper include directories so that SQLiteCpp can find SQLite3:
 get_property(SQLITECPP_INCLUDES DIRECTORY "lib/SQLiteCpp/" PROPERTY INCLUDE_DIRECTORIES)
 set(SQLITECPP_INCLUDES "${SQLITECPP_INCLUDES}" "${CMAKE_CURRENT_SOURCE_DIR}/lib/sqlite/")
 set_property(DIRECTORY lib/SQLiteCpp/ PROPERTY INCLUDE_DIRECTORIES "${SQLITECPP_INCLUDES}")
 set_property(TARGET SQLiteCpp PROPERTY INCLUDE_DIRECTORIES "${SQLITECPP_INCLUDES}")
 
+# Add proper includes for LibEvent's event-config.h header:
+include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS})
+
 if (WIN32)
 	add_subdirectory(lib/luaproxy/)
 endif()
 
 
 # We use EXCLUDE_FROM_ALL so that only the explicit dependencies are used
 # (PolarSSL also has test and example programs in their CMakeLists.txt, we don't want those)
-include(lib/polarssl.cmake)
+include(lib/polarssl.cmake EXCLUDE_FROM_ALL)
 
 set_exe_flags()
 
 add_subdirectory (src)
 
 if(${SELF_TEST})
+	message("Tests enabled")
 	enable_testing()
 	add_subdirectory (tests)
 endif()

COMPILING.md

@@ -69,9 +69,9 @@ After doing so, run the command `xcodebuild lib/polarssl/POLARSSL.xcodeproj` in
 
 ## Linux, FreeBSD etc. ##
 
-Install git, cmake and gcc or clang, using your platform's package manager:
+Install git, make, cmake and gcc or clang, using your platform's package manager:
 ```
-sudo apt-get install git cmake gcc g++
+sudo apt-get install git make cmake gcc g++
 ```
 
 ### Getting the sources ###

MCServer/Plugins/APIDump/APIDesc.lua

@@ -1840,7 +1840,9 @@ a_Player:OpenWindow(Window);
 				MoveToWorld = { Params = "WorldName", Return = "bool", Return = "Moves the player to the specified world. Returns true if successful." },
 				OpenWindow = { Params = "{{cWindow|Window}}", Return = "", Notes = "Opens the specified UI window for the player." },
 				PermissionMatches = { Params = "Permission, Template", Return = "bool", Notes = "(STATIC) Returns true if the specified permission matches the specified template. The template may contain wildcards." },
+				PlaceBlock = { Params = "BlockX, BlockY, BlockZ, BlockType, BlockMeta", Return = "bool", Notes = "Places a block while impersonating the player. The {{OnPlayerPlacingBlock|HOOK_PLAYER_PLACING_BLOCK}} hook is called before the placement, and if it succeeds, the block is placed and the {{OnPlayerPlacedBlock|HOOK_PLAYER_PLACED_BLOCK}} hook is called. Returns true iff the block is successfully placed. Assumes that the block is in a currently loaded chunk." },
 				Respawn = { Params = "", Return = "", Notes = "Restores the health, extinguishes fire, makes visible and sends the Respawn packet." },
+				SendBlocksAround = { Params = "BlockX, BlockY, BlockZ, [Range]", Return = "", Notes = "Sends all the world's blocks in Range from the specified coords to the player, as a BlockChange packet. Range defaults to 1 (only one block sent)." },
 				SendMessage = { Params = "Message", Return = "", Notes = "Sends the specified message to the player." },
 				SendMessageFailure = { Params = "Message", Return = "", Notes = "Prepends Rose [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For a command that failed to run because of insufficient permissions, etc." },
 				SendMessageFatal = { Params = "Message", Return = "", Notes = "Prepends Red [FATAL] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For something serious, such as a plugin crash, etc." },

MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua

@@ -12,18 +12,18 @@ return
 			Use the {{cPlayer}}:GetWorld() function to get the world to which the block belongs.</p>
 			<p>
 			See also the {{OnPlayerPlacingBlock|HOOK_PLAYER_PLACING_BLOCK}} hook for a similar hook called
-			before the placement.
+			before the placement.</p>
+			<p>
+			If the client action results in multiple blocks being placed (such as a bed or a door), each separate
+			block is reported through this hook. All the blocks are already present in the world before the first
+			instance of this hook is called.
 		]],
 		Params =
 		{
 			{ Name = "Player", Type = "{{cPlayer}}", Notes = "The player who placed the block" },
 			{ Name = "BlockX", Type = "number", Notes = "X-coord of the block" },
 			{ Name = "BlockY", Type = "number", Notes = "Y-coord of the block" },
 			{ Name = "BlockZ", Type = "number", Notes = "Z-coord of the block" },
-			{ Name = "BlockFace", Type = "number", Notes = "Face of the existing block upon which the player interacted. One of the BLOCK_FACE_ constants" },
-			{ Name = "CursorX", Type = "number", Notes = "X-coord of the cursor within the block face (0 .. 15)" },
-			{ Name = "CursorY", Type = "number", Notes = "Y-coord of the cursor within the block face (0 .. 15)" },
-			{ Name = "CursorZ", Type = "number", Notes = "Z-coord of the cursor within the block face (0 .. 15)" },
 			{ Name = "BlockType", Type = "BLOCKTYPE", Notes = "The block type of the block" },
 			{ Name = "BlockMeta", Type = "NIBBLETYPE", Notes = "The block meta of the block" },
 		},

MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua

@@ -15,18 +15,18 @@ return
 			Use the {{cPlayer}}:GetWorld() function to get the world to which the block belongs.</p>
 			<p>
 			See also the {{OnPlayerPlacedBlock|HOOK_PLAYER_PLACED_BLOCK}} hook for a similar hook called after
-			the placement.
+			the placement.</p>
+			<p>
+			If the client action results in multiple blocks being placed (such as a bed or a door), each separate
+			block is reported through this hook and only if all of them succeed, all the blocks are placed. If
+			any one of the calls are refused by the plugin, all the blocks are refused and reverted on the client.
 		]],
 		Params =
 		{
 			{ Name = "Player", Type = "{{cPlayer}}", Notes = "The player who is placing the block" },
 			{ Name = "BlockX", Type = "number", Notes = "X-coord of the block" },
 			{ Name = "BlockY", Type = "number", Notes = "Y-coord of the block" },
 			{ Name = "BlockZ", Type = "number", Notes = "Z-coord of the block" },
-			{ Name = "BlockFace", Type = "number", Notes = "Face of the existing block upon which the player is interacting. One of the BLOCK_FACE_ constants" },
-			{ Name = "CursorX", Type = "number", Notes = "X-coord of the cursor within the block face (0 .. 15)" },
-			{ Name = "CursorY", Type = "number", Notes = "Y-coord of the cursor within the block face (0 .. 15)" },
-			{ Name = "CursorZ", Type = "number", Notes = "Z-coord of the cursor within the block face (0 .. 15)" },
 			{ Name = "BlockType", Type = "BLOCKTYPE", Notes = "The block type of the block" },
 			{ Name = "BlockMeta", Type = "NIBBLETYPE", Notes = "The block meta of the block" },
 		},

MCServer/Plugins/APIDump/Hooks/OnServerPing.lua

@@ -7,7 +7,10 @@ return
 		Desc = [[
 			A plugin may implement an OnServerPing() function and register it as a Hook to process pings from
 			clients in the server server list. It can change the logged in players and player capacity, as well
-			as the server description and the favicon, that are displayed to the client in the server list.
+			as the server description and the favicon, that are displayed to the client in the server list.</p>
+			<p>
+			The client handle already has its protocol version assigned to it, so the plugin can check that; however,
+			there's no username associated with the client yet, and no player object.
 		]],
 		Params = {
 			{ Name = "ClientHandle", Type = "{{cClientHandle}}", Notes = "The client handle that pinged the server" },