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

EmptyMinecarts should be able to get a block inside of them.

Browse Source
This commit is contained in:
STRWarrior
2014-01-12 15:27:50 +01:00
parent 6ff375273b
commit c5603ce064
7 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Protocol/Protocol17x.cpp
View File

@@ -1781,7 +1781,22 @@ void cProtocol172::cPacketizer::WriteEntityMetadata(const cEntity & a_Entity)
WriteInt(1); // Shaking direction, doesn't seem to affect anything
WriteByte(0x73);
WriteFloat((float)(((const cMinecart &)a_Entity).LastDamage() + 10)); // Damage taken / shake effect multiplyer
if (((cMinecart &)a_Entity).GetPayload() == cMinecart::mpNone)
{
cEmptyMinecart EmptyMinecart = ((cEmptyMinecart &)a_Entity);
if (!EmptyMinecart.GetContent().IsEmpty())
{
WriteByte(0x54);
int Content = EmptyMinecart.GetContent().m_ItemType;
Content |= EmptyMinecart.GetContent().m_ItemDamage << 8;
WriteInt(Content);
WriteByte(0x55);
WriteInt(EmptyMinecart.GetBlockHeight());
WriteByte(0x56);
WriteByte(1);
}
}
if (((cMinecart &)a_Entity).GetPayload() == cMinecart::mpFurnace)
{
WriteByte(0x10);