diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-11-04 16:57:41 +0100 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-11-04 16:57:41 +0100 |
| commit | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (patch) | |
| tree | 7f1eaf8b94694c8e24e206909ba8f55a1ebfbb3e /src/server/serveractiveobject.cpp | |
| parent | 244713971a976e43e8740b6a9d9d122e37020ef2 (diff) | |
| download | dragonfireclient-6ccb5835ff55d85156be91473c598eca9d6cb9a6.tar.xz | |
Revert "Make Lint Happy"
This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.
Diffstat (limited to 'src/server/serveractiveobject.cpp')
| -rw-r--r-- | src/server/serveractiveobject.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/serveractiveobject.cpp b/src/server/serveractiveobject.cpp index 3acf4cece..3341dc008 100644 --- a/src/server/serveractiveobject.cpp +++ b/src/server/serveractiveobject.cpp @@ -23,14 +23,16 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "constants.h" // BS #include "log.h" -ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos) : - ActiveObject(0), m_env(env), m_base_position(pos) +ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos): + ActiveObject(0), + m_env(env), + m_base_position(pos) { } float ServerActiveObject::getMinimumSavedMovement() { - return 2.0 * BS; + return 2.0*BS; } ItemStack ServerActiveObject::getWieldedItem(ItemStack *selected, ItemStack *hand) const @@ -47,8 +49,7 @@ bool ServerActiveObject::setWieldedItem(const ItemStack &item) return false; } -std::string ServerActiveObject::generateUpdateInfantCommand( - u16 infant_id, u16 protocol_version) +std::string ServerActiveObject::generateUpdateInfantCommand(u16 infant_id, u16 protocol_version) { std::ostringstream os(std::ios::binary); // command |