flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Remove std::make_unique from redstone handler creation

Browse Source
This commit is contained in:
Tiger Wang
2020-08-19 21:14:40 +01:00
parent 6617d43983
commit 3143d6ce67
28 changed files with 494 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h
View File

@@ -1,16 +1,15 @@
#pragma once
#include "RedstoneHandler.h"
#include "../../BlockEntities/ChestEntity.h"
class cTrappedChestHandler final : public cRedstoneHandler
namespace TrappedChestHandler
{
virtual unsigned char GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked) const override
inline unsigned char GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked)
{
UNUSED(a_BlockType);
UNUSED(a_QueryPosition);
@@ -20,7 +19,7 @@ class cTrappedChestHandler final : public cRedstoneHandler
return DataForChunk(a_Chunk).GetCachedPowerData(a_Position).PowerLevel;
}
static unsigned char GetPowerLevel(cChunk & a_Chunk, Vector3i a_Position)
inline unsigned char GetPowerLevel(cChunk & a_Chunk, Vector3i a_Position)
{
int NumberOfPlayers = 0;
VERIFY(
@@ -35,7 +34,7 @@ class cTrappedChestHandler final : public cRedstoneHandler
return static_cast<unsigned char>(std::min(NumberOfPlayers, 15));
}
virtual void Update(cChunk & a_Chunk, cChunk & CurrentlyTicking, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData) const override
inline void Update(cChunk & a_Chunk, cChunk & CurrentlyTicking, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData)
{
// LOGD("Evaluating tricky the trapped chest (%d %d %d)", a_Position.x, a_Position.y, a_Position.z);
@@ -48,7 +47,7 @@ class cTrappedChestHandler final : public cRedstoneHandler
}
}
virtual void ForValidSourcePositions(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, SourceCallback Callback) const override
inline void ForValidSourcePositions(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, ForEachSourceCallback & Callback)
{
UNUSED(a_Chunk);
UNUSED(a_Position);