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

Scoreboard protocol support

Browse Source
This commit is contained in:
andrew
2014-01-21 15:58:17 +02:00
parent ff2302ebd5
commit aa61f55b74
17 changed files with 321 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Entities/Player.cpp
View File

@@ -111,8 +111,6 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
m_LastJumpHeight = (float)(GetPosY());
m_LastGroundHeight = (float)(GetPosY());
m_Stance = GetPosY() + 1.62;
// UpdateTeam();
cRoot::Get()->GetServer()->PlayerCreated(this);
}
@@ -867,10 +865,10 @@ void cPlayer::KilledBy(cEntity * a_Killer)
}
} IncrementCounter (GetName());
cScoreboard* Scoreboard = m_World->GetScoreBoard();
cScoreboard & Scoreboard = m_World->GetScoreBoard();
// Update scoreboard objectives
Scoreboard->ForEachObjectiveWith(cObjective::E_TYPE_DEATH_COUNT, IncrementCounter);
Scoreboard.ForEachObjectiveWith(cObjective::E_TYPE_DEATH_COUNT, IncrementCounter);
}
@@ -977,9 +975,16 @@ void cPlayer::SetTeam(cTeam * a_Team)
cTeam * cPlayer::UpdateTeam(void)
{
cScoreboard * Scoreboard = m_World->GetScoreBoard();
if (m_World == NULL)
{
SetTeam(NULL);
}
else
{
cScoreboard & Scoreboard = m_World->GetScoreBoard();
m_Team = Scoreboard->QueryPlayerTeam(GetName());
SetTeam(Scoreboard.QueryPlayerTeam(GetName()));
}
return m_Team;
}