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

Merge branch 'master' into ChunkLoader

Browse Source 
Conflicts:
	src/ClientHandle.cpp
This commit is contained in:
Howaner
2014-10-21 16:55:22 +02:00
parent 97623fc634 bc97399b01
commit 44514e53fc
130 changed files with 1953 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Entities/Player.cpp
View File

@@ -244,7 +244,7 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
if (m_Health > 0) // make sure player is alive
{
m_World->CollectPickupsByPlayer(this);
m_World->CollectPickupsByPlayer(*this);
if ((m_EatingFinishTick >= 0) && (m_EatingFinishTick <= m_World->GetWorldAge()))
{
@@ -2133,19 +2133,19 @@ void cPlayer::ApplyFoodExhaustionFromMovement()
void cPlayer::LoadRank(void)
{
// Load the values from cRankManager:
cRankManager & RankMgr = cRoot::Get()->GetRankManager();
m_Rank = RankMgr.GetPlayerRankName(m_UUID);
cRankManager * RankMgr = cRoot::Get()->GetRankManager();
m_Rank = RankMgr->GetPlayerRankName(m_UUID);
if (m_Rank.empty())
{
m_Rank = RankMgr.GetDefaultRank();
m_Rank = RankMgr->GetDefaultRank();
}
else
{
// Update the name:
RankMgr.UpdatePlayerName(m_UUID, m_PlayerName);
RankMgr->UpdatePlayerName(m_UUID, m_PlayerName);
}
m_Permissions = RankMgr.GetPlayerPermissions(m_UUID);
RankMgr.GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
m_Permissions = RankMgr->GetPlayerPermissions(m_UUID);
RankMgr->GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
// Break up the individual permissions on each dot, into m_SplitPermissions:
m_SplitPermissions.clear();