diff options
| author | tycho <tycho@hanoverdesktop> | 2013-12-20 01:13:04 +0100 |
|---|---|---|
| committer | tycho <tycho@hanoverdesktop> | 2013-12-20 01:13:04 +0100 |
| commit | 7735a956f06821e30116df808f94801b5fbd19e6 (patch) | |
| tree | 6c9c9c0b7484d1dd7343ba05c9b54b098e8104fd /src/Protocol/Protocol17x.cpp | |
| parent | fixed D9025 (diff) | |
| parent | Merge pull request #450 from mc-server/redstonefixes (diff) | |
| download | cuberite-7735a956f06821e30116df808f94801b5fbd19e6.tar cuberite-7735a956f06821e30116df808f94801b5fbd19e6.tar.gz cuberite-7735a956f06821e30116df808f94801b5fbd19e6.tar.bz2 cuberite-7735a956f06821e30116df808f94801b5fbd19e6.tar.lz cuberite-7735a956f06821e30116df808f94801b5fbd19e6.tar.xz cuberite-7735a956f06821e30116df808f94801b5fbd19e6.tar.zst cuberite-7735a956f06821e30116df808f94801b5fbd19e6.zip | |
Diffstat (limited to 'src/Protocol/Protocol17x.cpp')
| -rw-r--r-- | src/Protocol/Protocol17x.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index fff5311f6..161e81936 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -490,6 +490,7 @@ void cProtocol172::SendPlayerAbilities(void) if (m_Client->GetPlayer()->IsGameModeCreative()) { Flags |= 0x01; + Flags |= 0x08; // Godmode, used for creative } if (m_Client->GetPlayer()->IsFlying()) { @@ -499,7 +500,6 @@ void cProtocol172::SendPlayerAbilities(void) { Flags |= 0x04; } - // TODO: Other flags (god mode) Pkt.WriteByte(Flags); // TODO: Pkt.WriteFloat(m_Client->GetPlayer()->GetMaxFlyingSpeed()); Pkt.WriteFloat(0.05f); @@ -1291,23 +1291,16 @@ void cProtocol172::HandlePacketPlayerAbilities(cByteBuffer & a_ByteBuffer) HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, FlyingSpeed); HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, WalkingSpeed); - bool IsFlying, CanFly; + bool IsFlying = false, CanFly = false; if ((Flags & 2) != 0) { IsFlying = true; } - else - { - IsFlying = false; - } if ((Flags & 4) != 0) { CanFly = true; } - else - { - CanFly = false; - } + m_Client->HandlePlayerAbilities(CanFly, IsFlying, FlyingSpeed, WalkingSpeed); } |