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

SetBedPos: make World parameter non-null

Browse Source 
* Fixes #5190
This commit is contained in:
Tiger Wang 2021-06-06 17:20:21 +01:00
parent 2109057119
commit 93611b8437
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Entities/Player.cpp
View File

@ -776,9 +776,9 @@ void cPlayer::SetCustomName(const AString & a_CustomName)
void cPlayer::SetBedPos(const Vector3i & a_Pos)
void cPlayer::SetBedPos(const Vector3i a_Position)
{
m_LastBedPos = a_Pos;
m_LastBedPos = a_Position;
m_SpawnWorldName = m_World->GetName();
}
@ -786,11 +786,10 @@ void cPlayer::SetBedPos(const Vector3i & a_Pos)
void cPlayer::SetBedPos(const Vector3i & a_Pos, cWorld * a_World)
void cPlayer::SetBedPos(const Vector3i a_Position, const cWorld & a_World)
{
m_LastBedPos = a_Pos;
ASSERT(a_World != nullptr);
m_SpawnWorldName = a_World->GetName();
m_LastBedPos = a_Position;
m_SpawnWorldName = a_World.GetName();
}
@ -1752,7 +1751,7 @@ void cPlayer::LoadFromDisk()
const Vector3i WorldSpawn(static_cast<int>(m_World->GetSpawnX()), static_cast<int>(m_World->GetSpawnY()), static_cast<int>(m_World->GetSpawnZ()));
SetPosition(WorldSpawn);
SetBedPos(WorldSpawn, m_World);
SetBedPos(WorldSpawn, *m_World);
m_Inventory.Clear();
m_EnchantmentSeed = GetRandomProvider().RandInt<unsigned int>(); // Use a random number to seed the enchantment generator

4
src/Entities/Player.h
View File

@ -520,10 +520,10 @@ public:
/** Sets the player's bed (home / respawn) position to the specified position.
Sets the respawn world to the player's world. */
void SetBedPos(const Vector3i & a_Pos);
void SetBedPos(const Vector3i a_Position);
/** Sets the player's bed (home / respawn) position and respawn world to the specified parameters. */
void SetBedPos(const Vector3i & a_Pos, cWorld * a_World);
void SetBedPos(const Vector3i a_Position, const cWorld & a_World);
// tolua_end