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

Some const and inheritance correctness (#5014)

Browse Source 
* Some const and inheritance correctness
* Devirtualise SendBlockTo(Vector3i)

Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
This commit is contained in:
12xx12 2020-11-13 22:50:46 +01:00 committed by GitHub
parent 14a00d0051
commit 283b9d706c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/World.cpp
View File

@ -486,7 +486,7 @@ void cWorld::CastThunderbolt(Vector3i a_Block)
int cWorld::GetDefaultWeatherInterval(eWeather a_Weather) int cWorld::GetDefaultWeatherInterval(eWeather a_Weather) const
{ {
auto & Random = GetRandomProvider(); auto & Random = GetRandomProvider();
switch (a_Weather) switch (a_Weather)

11
src/World.h
View File

@ -140,7 +140,7 @@ public:
/** Returns the default weather interval for the specific weather type. /** Returns the default weather interval for the specific weather type.
Returns -1 for any unknown weather. */ Returns -1 for any unknown weather. */
int GetDefaultWeatherInterval(eWeather a_Weather); int GetDefaultWeatherInterval(eWeather a_Weather) const;
/** Returns the current game mode. Partly OBSOLETE, you should use IsGameModeXXX() functions wherever applicable */ /** Returns the current game mode. Partly OBSOLETE, you should use IsGameModeXXX() functions wherever applicable */
eGameMode GetGameMode(void) const { return m_GameMode; } eGameMode GetGameMode(void) const { return m_GameMode; }
@ -666,6 +666,8 @@ public:
/** Retrieves block types of the specified blocks. If a chunk is not loaded, doesn't modify the block. Returns true if all blocks were read. */ /** Retrieves block types of the specified blocks. If a chunk is not loaded, doesn't modify the block. Returns true if all blocks were read. */
bool GetBlocks(sSetBlockVector & a_Blocks, bool a_ContinueOnFailure); bool GetBlocks(sSetBlockVector & a_Blocks, bool a_ContinueOnFailure);
using cWorldInterface::SendBlockTo;
// tolua_begin // tolua_begin
/** Replaces the specified block with air, and calls the OnBroken block handler. /** Replaces the specified block with air, and calls the OnBroken block handler.
@ -697,14 +699,9 @@ public:
Returns an empty cItems object if the chunk is not present. */ Returns an empty cItems object if the chunk is not present. */
cItems PickupsFromBlock(Vector3i a_BlockPos, const cEntity * a_Digger = nullptr, const cItem * a_Tool = nullptr); cItems PickupsFromBlock(Vector3i a_BlockPos, const cEntity * a_Digger = nullptr, const cItem * a_Tool = nullptr);
virtual void SendBlockTo(int a_X, int a_Y, int a_Z, cPlayer & a_Player) override;
/** Sends the block at the specified coords to the player. /** Sends the block at the specified coords to the player.
Used mainly when plugins disable block-placing or block-breaking, to restore the previous block. */ Used mainly when plugins disable block-placing or block-breaking, to restore the previous block. */
void SendBlockTo(const Vector3i a_BlockPos, cPlayer & a_Player) virtual void SendBlockTo(int a_X, int a_Y, int a_Z, cPlayer & a_Player) override;
{
SendBlockTo(a_BlockPos.x, a_BlockPos.y, a_BlockPos.z, a_Player);
}
/** Set default spawn at the given coordinates. /** Set default spawn at the given coordinates.
Returns false if the new spawn couldn't be stored in the INI file. */ Returns false if the new spawn couldn't be stored in the INI file. */