Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures

Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp

src/World.cpp

@@ -14,6 +14,7 @@
 
 // Entities (except mobs):
 #include "Entities/ExpOrb.h"
+#include "Entities/FallingBlock.h"
 #include "Entities/Pickup.h"
 #include "Entities/Player.h"
 #include "Entities/TNTEntity.h"
@@ -35,12 +36,11 @@
 
 #include "MersenneTwister.h"
 #include "Generating/Trees.h"
-#include "PluginManager.h"
+#include "Bindings/PluginManager.h"
 #include "Blocks/BlockHandler.h"
 #include "Vector3d.h"
 
 #include "Tracer.h"
-#include "tolua++.h"
 
 // DEBUG: Test out the cLineBlockTracer class by tracing a few lines:
 #include "LineBlockTracer.h"
@@ -1634,6 +1634,17 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double
 
 
 
+int cWorld::SpawnFallingBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE BlockType, NIBBLETYPE BlockMeta)
+{
+	cFallingBlock * FallingBlock = new cFallingBlock(Vector3i(a_X, a_Y, a_Z), BlockType, BlockMeta);
+	FallingBlock->Initialize(this);
+	return FallingBlock->GetUniqueID();
+}
+
+
+
+
+
 int cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward)
 {
 	cExpOrb * ExpOrb = new cExpOrb(a_X, a_Y, a_Z, a_Reward);