diff options
author | p-mcgowan <mickeymcgowan@shaw.ca> | 2014-12-04 22:31:58 +0100 |
---|---|---|
committer | p-mcgowan <mickeymcgowan@shaw.ca> | 2014-12-04 22:31:58 +0100 |
commit | 8557ab18d0cff48fbd3cefe45cdebc4be1afb71a (patch) | |
tree | a460a2b6d674e64764b6a70c820d7a1d9867e7f8 /src/Mobs | |
parent | reformat for lua and CI (diff) | |
parent | Merge pull request #1645 from jonfabe/SpectatorModeFixes (diff) | |
download | cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.tar cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.tar.gz cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.tar.bz2 cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.tar.lz cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.tar.xz cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.tar.zst cuberite-8557ab18d0cff48fbd3cefe45cdebc4be1afb71a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Mobs/Pig.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Mobs/Pig.cpp b/src/Mobs/Pig.cpp index 50b69e44f..1e4c35acd 100644 --- a/src/Mobs/Pig.cpp +++ b/src/Mobs/Pig.cpp @@ -49,17 +49,17 @@ void cPig::OnRightClicked(cPlayer & a_Player) a_Player.Detach(); return; } - + if (m_Attachee->IsPlayer()) { // Another player is already sitting in here, cannot attach return; } - + // Detach whatever is sitting in this pig now: m_Attachee->Detach(); } - + // Attach the player to this pig a_Player.AttachTo(this); } @@ -100,7 +100,7 @@ void cPig::Tick(float a_Dt, cChunk & a_Chunk) bool cPig::DoTakeDamage(TakeDamageInfo & a_TDI) -{ +{ if (!super::DoTakeDamage(a_TDI)) { return false; |