flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2754 from Gargaj/horsefix

Browse Source 
Allow horse control
This commit is contained in:
worktycho 2015-12-15 21:53:23 +00:00
commit 83418e1d7a
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mobs/Horse.cpp
View File

@ -23,7 +23,8 @@ cHorse::cHorse(int Type, int Color, int Style, int TameTimes) :
m_Armour(0), m_Armour(0),
m_TimesToTame(TameTimes), m_TimesToTame(TameTimes),
m_TameAttemptTimes(0), m_TameAttemptTimes(0),
m_RearTickCount(0) m_RearTickCount(0),
m_Speed(20.0)
{ {
} }
@ -67,6 +68,7 @@ void cHorse::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
} }
else else
{ {
// TODO: emit hearts here
m_bIsTame = true; m_bIsTame = true;
} }
} }
@ -158,3 +160,21 @@ void cHorse::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cHorse::InStateIdle(std::chrono::milliseconds a_Dt)
{
// If horse is tame and someone is sitting on it, don't walk around
if ((!m_bIsTame) || (m_Attachee == nullptr))
{
super::InStateIdle(a_Dt);
}
}
void cHorse::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
{
super::HandleSpeedFromAttachee(a_Forward * m_Speed, a_Sideways * m_Speed);
}

3
src/Mobs/Horse.h
View File

@ -18,6 +18,8 @@ public:
CLASS_PROTODEF(cHorse) CLASS_PROTODEF(cHorse)
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override;
virtual void InStateIdle(std::chrono::milliseconds a_Dt) override;
virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) override;
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
virtual void OnRightClicked(cPlayer & a_Player) override; virtual void OnRightClicked(cPlayer & a_Player) override;
@ -42,6 +44,7 @@ private:
bool m_bHasChest, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame, m_bIsSaddled; bool m_bHasChest, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame, m_bIsSaddled;
int m_Type, m_Color, m_Style, m_Armour, m_TimesToTame, m_TameAttemptTimes, m_RearTickCount; int m_Type, m_Color, m_Style, m_Armour, m_TimesToTame, m_TameAttemptTimes, m_RearTickCount;
float m_Speed;
} ; } ;

6
src/Protocol/Protocol18x.cpp
View File

@ -2486,8 +2486,8 @@ void cProtocol180::HandlePacketSlotSelect(cByteBuffer & a_ByteBuffer)
void cProtocol180::HandlePacketSteerVehicle(cByteBuffer & a_ByteBuffer) void cProtocol180::HandlePacketSteerVehicle(cByteBuffer & a_ByteBuffer)
{ {
HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, Forward);
HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, Sideways); HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, Sideways);
HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, Forward);
HANDLE_READ(a_ByteBuffer, ReadBEUInt8, UInt8, Flags); HANDLE_READ(a_ByteBuffer, ReadBEUInt8, UInt8, Flags);
if ((Flags & 0x2) != 0) if ((Flags & 0x2) != 0)
@ -2495,6 +2495,10 @@ void cProtocol180::HandlePacketSteerVehicle(cByteBuffer & a_ByteBuffer)
m_Client->HandleUnmount(); m_Client->HandleUnmount();
} }
else if ((Flags & 0x1) != 0) else if ((Flags & 0x1) != 0)
{
// jump
}
else
{ {
m_Client->HandleSteerVehicle(Forward, Sideways); m_Client->HandleSteerVehicle(Forward, Sideways);
} }