diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/server/serveractiveobject.cpp | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/server/serveractiveobject.cpp')
| -rw-r--r-- | src/server/serveractiveobject.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/server/serveractiveobject.cpp b/src/server/serveractiveobject.cpp index 3341dc008..3acf4cece 100644 --- a/src/server/serveractiveobject.cpp +++ b/src/server/serveractiveobject.cpp @@ -23,16 +23,14 @@ 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 @@ -49,7 +47,8 @@ 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 |