diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2018-07-24 23:30:49 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2018-07-24 23:30:49 +0200 |
| commit | c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd (patch) | |
| tree | 3a373f8ea6f06dc9b117d2d103bfaee5705040b8 /src/Mobs | |
| parent | Stop cFunctionRef constructor from disabling default copy constructor. (#4173) (diff) | |
| download | cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.tar cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.tar.gz cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.tar.bz2 cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.tar.lz cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.tar.xz cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.tar.zst cuberite-c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd.zip | |
Diffstat (limited to 'src/Mobs')
| -rw-r--r-- | src/Mobs/Horse.cpp | 3 | ||||
| -rw-r--r-- | src/Mobs/Ocelot.cpp | 5 | ||||
| -rw-r--r-- | src/Mobs/Wolf.cpp | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/Mobs/Horse.cpp b/src/Mobs/Horse.cpp index 77edc0d27..af325ae67 100644 --- a/src/Mobs/Horse.cpp +++ b/src/Mobs/Horse.cpp @@ -4,7 +4,6 @@ #include "../World.h" #include "../EffectID.h" #include "../Entities/Player.h" -#include "Broadcaster.h" #include "UI/HorseWindow.h" @@ -90,7 +89,7 @@ void cHorse::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) } else { - m_World->GetBroadcaster().BroadcastParticleEffect("heart", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); + m_World->BroadcastParticleEffect("heart", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); m_bIsTame = true; } } diff --git a/src/Mobs/Ocelot.cpp b/src/Mobs/Ocelot.cpp index 5e94cacb9..7ebe37d20 100644 --- a/src/Mobs/Ocelot.cpp +++ b/src/Mobs/Ocelot.cpp @@ -5,7 +5,6 @@ #include "../World.h" #include "../Entities/Player.h" #include "../Items/ItemHandler.h" -#include "Broadcaster.h" #include "../BoundingBox.h" @@ -159,13 +158,13 @@ void cOcelot::OnRightClicked(cPlayer & a_Player) SetOwner(a_Player.GetName(), a_Player.GetUUID()); SetCatType(static_cast<eCatType>(Random.RandInt<int>(1, 3))); m_World->BroadcastEntityStatus(*this, esWolfTamed); - m_World->GetBroadcaster().BroadcastParticleEffect("heart", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); + m_World->BroadcastParticleEffect("heart", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); } else { // Taming failed m_World->BroadcastEntityStatus(*this, esWolfTaming); - m_World->GetBroadcaster().BroadcastParticleEffect("smoke", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); + m_World->BroadcastParticleEffect("smoke", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); } } } diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index 45df3dd05..ffeb8cf90 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -5,7 +5,6 @@ #include "../World.h" #include "../Entities/Player.h" #include "../Items/ItemHandler.h" -#include "Broadcaster.h" @@ -183,13 +182,13 @@ void cWolf::OnRightClicked(cPlayer & a_Player) SetIsTame(true); SetOwner(a_Player.GetName(), a_Player.GetUUID()); m_World->BroadcastEntityStatus(*this, esWolfTamed); - m_World->GetBroadcaster().BroadcastParticleEffect("heart", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); + m_World->BroadcastParticleEffect("heart", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); } else { // Taming failed m_World->BroadcastEntityStatus(*this, esWolfTaming); - m_World->GetBroadcaster().BroadcastParticleEffect("smoke", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); + m_World->BroadcastParticleEffect("smoke", static_cast<Vector3f>(GetPosition()), Vector3f{}, 0, 5); } } } |