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

Merge pull request #2348 from bibo38/customname

Browse Source 
Added CustomName and Health to sended Metadata of Monsters.
This commit is contained in:
Tiger Wang 2015-07-15 22:18:11 +01:00
commit eadd761a29
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Protocol/Protocol17x.cpp
View File

@ -3016,6 +3016,19 @@ void cProtocol172::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_En
void cProtocol172::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob) void cProtocol172::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob)
{ {
// Living Enitiy Metadata
if (a_Mob.HasCustomName())
{
a_Pkt.WriteBEUInt8(0x8a);
a_Pkt.WriteString(a_Mob.GetCustomName());
a_Pkt.WriteBEUInt8(0x0b);
a_Pkt.WriteBool(a_Mob.IsCustomNameAlwaysVisible());
}
a_Pkt.WriteBEUInt8(0x66);
a_Pkt.WriteBEFloat(a_Mob.GetHealth());
switch (a_Mob.GetMobType()) switch (a_Mob.GetMobType())
{ {
case mtBat: case mtBat:
@ -3209,15 +3222,6 @@ void cProtocol172::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob)
break; break;
} }
} // switch (a_Mob.GetType()) } // switch (a_Mob.GetType())
// Custom name:
if (a_Mob.HasCustomName())
{
a_Pkt.WriteBEUInt8(0x8a);
a_Pkt.WriteString(a_Mob.GetCustomName());
a_Pkt.WriteBEUInt8(0x0b);
a_Pkt.WriteBEUInt8(a_Mob.IsCustomNameAlwaysVisible() ? 1 : 0);
}
} }

15
src/Protocol/Protocol18x.cpp
View File

@ -3207,7 +3207,7 @@ void cProtocol180::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_En
} }
a_Pkt.WriteBEUInt8(0); // Byte(0) + index 0 a_Pkt.WriteBEUInt8(0); // Byte(0) + index 0
a_Pkt.WriteBEUInt8(Flags); a_Pkt.WriteBEUInt8(Flags);
switch (a_Entity.GetEntityType()) switch (a_Entity.GetEntityType())
{ {
case cEntity::etPlayer: break; // TODO? case cEntity::etPlayer: break; // TODO?
@ -3313,6 +3313,19 @@ void cProtocol180::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_En
void cProtocol180::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob) void cProtocol180::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob)
{ {
// Living Enitiy Metadata
if (a_Mob.HasCustomName())
{
a_Pkt.WriteBEUInt8(0x82);
a_Pkt.WriteString(a_Mob.GetCustomName());
a_Pkt.WriteBEUInt8(0x03);
a_Pkt.WriteBool(a_Mob.IsCustomNameAlwaysVisible());
}
a_Pkt.WriteBEUInt8(0x66);
a_Pkt.WriteBEFloat(a_Mob.GetHealth());
switch (a_Mob.GetMobType()) switch (a_Mob.GetMobType())
{ {
case mtBat: case mtBat: