diff options
author | x12xx12x <44411062+12xx12@users.noreply.github.com> | 2022-04-20 00:10:35 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2022-04-20 09:41:02 +0200 |
commit | fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6 (patch) | |
tree | a5c9f00728af0f2ca841bb5d881b8d0d785b24ae /src/World.h | |
parent | Updated protocol functions to Vector3x (diff) | |
download | cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.gz cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.bz2 cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.lz cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.xz cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.zst cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.zip |
Diffstat (limited to 'src/World.h')
-rw-r--r-- | src/World.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/World.h b/src/World.h index a8a6e1b14..8f37d59df 100644 --- a/src/World.h +++ b/src/World.h @@ -311,12 +311,7 @@ public: void ChunkLoadFailed(int a_ChunkX, int a_ChunkZ); /** Sets the sign text, asking plugins for permission first. a_Player is the player who this change belongs to, may be nullptr. Returns true if sign text changed. */ - bool SetSignLines(Vector3i a_BlockPos, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player = nullptr); - bool SetSignLines(int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player = nullptr) // Exported in ManualBindings.cpp - { - return SetSignLines({a_BlockX, a_BlockY, a_BlockZ}, a_Line1, a_Line2, a_Line3, a_Line4, a_Player); - } - + bool SetSignLines(Vector3i a_BlockPos, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player = nullptr); // Exported in ManualBindings.cpp /** Sets the command block command. Returns true if command changed. */ bool SetCommandBlockCommand(int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Command); // tolua_export @@ -1137,7 +1132,11 @@ private: bool CanSpawnAt(int a_X, int & a_Y, int a_Z); /** Check if player starting point is acceptable */ - bool CheckPlayerSpawnPoint(int a_PosX, int a_PosY, int a_PosZ); + bool CheckPlayerSpawnPoint(int a_PosX, int a_PosY, int a_PosZ) + { + return CheckPlayerSpawnPoint({a_PosX, a_PosY, a_PosZ}); + } + bool CheckPlayerSpawnPoint(Vector3i a_Pos); /** Chooses a reasonable transition from the current weather to a new weather */ eWeather ChooseNewWeather(void); |