Merge branch 'master' into Inventory

src/BlockEntities/BeaconEntity.cpp

@@ -267,7 +267,7 @@ void cBeaconEntity::GiveEffects(void)
 
 
 
-bool cBeaconEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cBeaconEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	// Update the beacon every 4 seconds
 	if ((GetWorld()->GetWorldAge() % 80) == 0)

src/BlockEntities/BeaconEntity.h

@@ -30,7 +30,7 @@ public:
 
 	// cBlockEntity overrides:
 	virtual void SendTo(cClientHandle & a_Client) override;
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
 
 	/** Modify the beacon level. (It is needed to load the beacon corectly) */

src/BlockEntities/BlockEntity.h

@@ -110,7 +110,7 @@ public:
 	virtual void SendTo(cClientHandle & a_Client) = 0;
 	
 	/// Ticks the entity; returns true if the chunk should be marked as dirty as a result of this ticking. By default does nothing.
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk)
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 	{
 		UNUSED(a_Dt);
 		return false;

src/BlockEntities/CommandBlockEntity.cpp

@@ -125,7 +125,7 @@ void cCommandBlockEntity::SetRedstonePower(bool a_IsPowered)
 
 
 
-bool cCommandBlockEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cCommandBlockEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
 	UNUSED(a_Chunk);

src/BlockEntities/CommandBlockEntity.h

@@ -33,7 +33,7 @@ public:
 	/// Creates a new empty command block entity
 	cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
 
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
 	virtual void SendTo(cClientHandle & a_Client) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
 

src/BlockEntities/DropSpenserEntity.cpp

@@ -126,7 +126,7 @@ void cDropSpenserEntity::SetRedstonePower(bool a_IsPowered)
 
 
 
-bool cDropSpenserEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cDropSpenserEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
 	if (!m_ShouldDropSpense)

src/BlockEntities/DropSpenserEntity.h

@@ -47,7 +47,7 @@ public:
 	virtual ~cDropSpenserEntity();
 	
 	// cBlockEntity overrides:
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
 	virtual void SendTo(cClientHandle & a_Client) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
 	

src/BlockEntities/FurnaceEntity.cpp

@@ -90,7 +90,7 @@ bool cFurnaceEntity::ContinueCooking(void)
 
 
 
-bool cFurnaceEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cFurnaceEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
 

src/BlockEntities/FurnaceEntity.h

@@ -42,7 +42,7 @@ public:
 
 	// cBlockEntity overrides:
 	virtual void SendTo(cClientHandle & a_Client) override;
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
 	virtual void Destroy() override
 	{

src/BlockEntities/HopperEntity.cpp

@@ -55,7 +55,7 @@ bool cHopperEntity::GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, i
 
 
 
-bool cHopperEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cHopperEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
 	Int64 CurrentTick = a_Chunk.GetWorld()->GetWorldAge();

src/BlockEntities/HopperEntity.h

@@ -48,7 +48,7 @@ protected:
 	Int64 m_LastMoveItemsOutTick;
 
 	// cBlockEntity overrides:
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
 	virtual void SendTo(cClientHandle & a_Client) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
 	

src/BlockEntities/MobSpawnerEntity.cpp

@@ -73,7 +73,7 @@ void cMobSpawnerEntity::UpdateActiveState(void)
 
 
 
-bool cMobSpawnerEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cMobSpawnerEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	// Update the active flag every 5 seconds
 	if ((m_World->GetWorldAge() % 100) == 0)

src/BlockEntities/MobSpawnerEntity.h

@@ -29,7 +29,7 @@ public:
 
 	virtual void SendTo(cClientHandle & a_Client) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
 
 	// tolua_begin