diff options
| author | andrew <xdotftw@gmail.com> | 2014-01-19 15:02:37 +0100 |
|---|---|---|
| committer | andrew <xdotftw@gmail.com> | 2014-01-19 15:02:37 +0100 |
| commit | f321b5d224cb4a6d562cfb32850bf752ddd69f61 (patch) | |
| tree | f721fdfd6708d7c92965c3dc2b9330e0e09653da /src/Entities | |
| parent | Basic scoreboard implementation (diff) | |
| download | cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.tar cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.tar.gz cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.tar.bz2 cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.tar.lz cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.tar.xz cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.tar.zst cuberite-f321b5d224cb4a6d562cfb32850bf752ddd69f61.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Player.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 4f3c6138b..d2fdba909 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -798,7 +798,7 @@ void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI) if ((m_Team != NULL) && (m_Team == Attacker->m_Team)) { - if (!m_Team->GetFriendlyFire()) + if (!m_Team->AllowsFriendlyFire()) { // Friendly fire is disabled return; @@ -868,7 +868,7 @@ void cPlayer::KilledBy(cEntity * a_Killer) cScoreboard* Scoreboard = m_World->GetScoreBoard(); // Update scoreboard objectives - Scoreboard->ForEachObjectiveWith(E_OBJECTIVE_DEATH_COUNT, IncrementCounter); + Scoreboard->ForEachObjectiveWith(cObjective::E_TYPE_DEATH_COUNT, IncrementCounter); } @@ -953,14 +953,14 @@ void cPlayer::SetTeam(cTeam* a_Team) { if (m_Team) { - m_Team->RemovePlayer(this); + m_Team->RemovePlayer(GetName()); } m_Team = a_Team; if (m_Team) { - m_Team->AddPlayer(this); + m_Team->AddPlayer(GetName()); } } |