diff options
Diffstat (limited to 'src/Protocol')
| -rw-r--r-- | src/Protocol/Protocol_1_10.cpp | 74 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_11.cpp | 76 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_12.cpp | 64 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_8.cpp | 72 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_9.cpp | 78 |
5 files changed, 182 insertions, 182 deletions
diff --git a/src/Protocol/Protocol_1_10.cpp b/src/Protocol/Protocol_1_10.cpp index a16ad3143..d260feca8 100644 --- a/src/Protocol/Protocol_1_10.cpp +++ b/src/Protocol/Protocol_1_10.cpp @@ -398,7 +398,7 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { case cEntity::etPlayer: { - auto & Player = reinterpret_cast<const cPlayer &>(a_Entity); + auto & Player = static_cast<const cPlayer &>(a_Entity); // TODO Set player custom name to their name. // Then it's possible to move the custom name of mobs to the entities @@ -424,7 +424,7 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { a_Pkt.WriteBEUInt8(ITEM_ITEM); a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cPickup &>(a_Entity).GetItem()); + WriteItem(a_Pkt, static_cast<const cPickup &>(a_Entity).GetItem()); break; } case cEntity::etMinecart: @@ -433,7 +433,7 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); // The following expression makes Minecarts shake more with less health or higher damage taken - auto & Minecart = reinterpret_cast<const cMinecart &>(a_Entity); + auto & Minecart = static_cast<const cMinecart &>(a_Entity); auto maxHealth = a_Entity.GetMaxHealth(); auto curHealth = a_Entity.GetHealth(); a_Pkt.WriteVarInt32(static_cast<UInt32>((maxHealth - curHealth) * Minecart.LastDamage() * 4)); @@ -448,7 +448,7 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & if (Minecart.GetPayload() == cMinecart::mpNone) { - auto & RideableMinecart = reinterpret_cast<const cRideableMinecart &>(Minecart); + auto & RideableMinecart = static_cast<const cRideableMinecart &>(Minecart); const cItem & MinecartContent = RideableMinecart.GetContent(); if (!MinecartContent.IsEmpty()) { @@ -471,35 +471,35 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { a_Pkt.WriteBEUInt8(MINECART_FURNACE_POWERED); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); - a_Pkt.WriteBool(reinterpret_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); + a_Pkt.WriteBool(static_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); } break; } // case etMinecart case cEntity::etProjectile: { - auto & Projectile = reinterpret_cast<const cProjectileEntity &>(a_Entity); + auto & Projectile = static_cast<const cProjectileEntity &>(a_Entity); switch (Projectile.GetProjectileKind()) { case cProjectileEntity::pkArrow: { a_Pkt.WriteBEUInt8(ARROW_CRITICAL); a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); - a_Pkt.WriteBEInt8(reinterpret_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); + a_Pkt.WriteBEInt8(static_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); break; } case cProjectileEntity::pkFirework: { a_Pkt.WriteBEUInt8(FIREWORK_INFO); // Firework item used for this firework a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cFireworkEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cFireworkEntity &>(Projectile).GetItem()); break; } case cProjectileEntity::pkSplashPotion: { a_Pkt.WriteBEUInt8(POTION_THROWN); // Potion item which was thrown a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cSplashPotionEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cSplashPotionEntity &>(Projectile).GetItem()); } default: { @@ -511,13 +511,13 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & case cEntity::etMonster: { - WriteMobMetadata(a_Pkt, reinterpret_cast<const cMonster &>(a_Entity)); + WriteMobMetadata(a_Pkt, static_cast<const cMonster &>(a_Entity)); break; } case cEntity::etBoat: { - auto & Boat = reinterpret_cast<const cBoat &>(a_Entity); + auto & Boat = static_cast<const cBoat &>(a_Entity); a_Pkt.WriteBEInt8(BOAT_LAST_HIT_TIME); a_Pkt.WriteBEInt8(METADATA_TYPE_VARINT); @@ -548,7 +548,7 @@ void cProtocol_1_10_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & case cEntity::etItemFrame: { - auto & Frame = reinterpret_cast<const cItemFrame &>(a_Entity); + auto & Frame = static_cast<const cItemFrame &>(a_Entity); a_Pkt.WriteBEUInt8(ITEM_FRAME_ITEM); a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); WriteItem(a_Pkt, Frame.GetItem()); @@ -577,7 +577,7 @@ void cProtocol_1_10_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity { case E_BLOCK_BEACON: { - auto & BeaconEntity = reinterpret_cast<const cBeaconEntity &>(a_BlockEntity); + auto & BeaconEntity = static_cast<const cBeaconEntity &>(a_BlockEntity); Writer.AddInt("x", BeaconEntity.GetPosX()); Writer.AddInt("y", BeaconEntity.GetPosY()); Writer.AddInt("z", BeaconEntity.GetPosZ()); @@ -590,7 +590,7 @@ void cProtocol_1_10_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_COMMAND_BLOCK: { - auto & CommandBlockEntity = reinterpret_cast<const cCommandBlockEntity &>(a_BlockEntity); + auto & CommandBlockEntity = static_cast<const cCommandBlockEntity &>(a_BlockEntity); Writer.AddByte("TrackOutput", 1); // Neither I nor the MC wiki has any idea about this Writer.AddInt("SuccessCount", CommandBlockEntity.GetResult()); Writer.AddInt("x", CommandBlockEntity.GetPosX()); @@ -611,7 +611,7 @@ void cProtocol_1_10_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_HEAD: { - auto & MobHeadEntity = reinterpret_cast<const cMobHeadEntity &>(a_BlockEntity); + auto & MobHeadEntity = static_cast<const cMobHeadEntity &>(a_BlockEntity); Writer.AddInt("x", MobHeadEntity.GetPosX()); Writer.AddInt("y", MobHeadEntity.GetPosY()); Writer.AddInt("z", MobHeadEntity.GetPosZ()); @@ -637,7 +637,7 @@ void cProtocol_1_10_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_FLOWER_POT: { - auto & FlowerPotEntity = reinterpret_cast<const cFlowerPotEntity &>(a_BlockEntity); + auto & FlowerPotEntity = static_cast<const cFlowerPotEntity &>(a_BlockEntity); Writer.AddInt("x", FlowerPotEntity.GetPosX()); Writer.AddInt("y", FlowerPotEntity.GetPosY()); Writer.AddInt("z", FlowerPotEntity.GetPosZ()); @@ -649,7 +649,7 @@ void cProtocol_1_10_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_MOB_SPAWNER: { - auto & MobSpawnerEntity = reinterpret_cast<const cMobSpawnerEntity &>(a_BlockEntity); + auto & MobSpawnerEntity = static_cast<const cMobSpawnerEntity &>(a_BlockEntity); Writer.AddInt("x", MobSpawnerEntity.GetPosX()); Writer.AddInt("y", MobSpawnerEntity.GetPosY()); Writer.AddInt("z", MobSpawnerEntity.GetPosZ()); @@ -700,7 +700,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ { case mtBat: { - auto & Bat = reinterpret_cast<const cBat &>(a_Mob); + auto & Bat = static_cast<const cBat &>(a_Mob); a_Pkt.WriteBEUInt8(BAT_HANGING); a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); a_Pkt.WriteBEInt8(Bat.IsHanging() ? 1 : 0); @@ -709,7 +709,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtChicken: { - auto & Chicken = reinterpret_cast<const cChicken &>(a_Mob); + auto & Chicken = static_cast<const cChicken &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -719,7 +719,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtCow: { - auto & Cow = reinterpret_cast<const cCow &>(a_Mob); + auto & Cow = static_cast<const cCow &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -729,7 +729,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtCreeper: { - auto & Creeper = reinterpret_cast<const cCreeper &>(a_Mob); + auto & Creeper = static_cast<const cCreeper &>(a_Mob); a_Pkt.WriteBEUInt8(CREEPER_STATE); // (idle or "blowing") a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Creeper.IsBlowing() ? 1 : static_cast<UInt32>(-1)); @@ -746,7 +746,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtEnderman: { - auto & Enderman = reinterpret_cast<const cEnderman &>(a_Mob); + auto & Enderman = static_cast<const cEnderman &>(a_Mob); a_Pkt.WriteBEUInt8(ENDERMAN_CARRIED_BLOCK); a_Pkt.WriteBEUInt8(METADATA_TYPE_BLOCKID); UInt32 Carried = 0; @@ -762,7 +762,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtGhast: { - auto & Ghast = reinterpret_cast<const cGhast &>(a_Mob); + auto & Ghast = static_cast<const cGhast &>(a_Mob); a_Pkt.WriteBEUInt8(GHAST_ATTACKING); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Ghast.IsCharging()); @@ -771,7 +771,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtHorse: { - auto & Horse = reinterpret_cast<const cHorse &>(a_Mob); + auto & Horse = static_cast<const cHorse &>(a_Mob); Int8 Flags = 0; if (Horse.IsTame()) { @@ -824,7 +824,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtMagmaCube: { - auto & MagmaCube = reinterpret_cast<const cMagmaCube &>(a_Mob); + auto & MagmaCube = static_cast<const cMagmaCube &>(a_Mob); a_Pkt.WriteBEUInt8(SLIME_SIZE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(MagmaCube.GetSize())); @@ -833,7 +833,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtOcelot: { - auto & Ocelot = reinterpret_cast<const cOcelot &>(a_Mob); + auto & Ocelot = static_cast<const cOcelot &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -843,7 +843,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtPig: { - auto & Pig = reinterpret_cast<const cPig &>(a_Mob); + auto & Pig = static_cast<const cPig &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -858,7 +858,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtRabbit: { - auto & Rabbit = reinterpret_cast<const cRabbit &>(a_Mob); + auto & Rabbit = static_cast<const cRabbit &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Rabbit.IsBaby()); @@ -871,7 +871,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtSheep: { - auto & Sheep = reinterpret_cast<const cSheep &>(a_Mob); + auto & Sheep = static_cast<const cSheep &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -891,7 +891,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtSkeleton: { - auto & Skeleton = reinterpret_cast<const cSkeleton &>(a_Mob); + auto & Skeleton = static_cast<const cSkeleton &>(a_Mob); a_Pkt.WriteBEUInt8(SKELETON_TYPE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Skeleton.IsWither() ? 1 : 0); @@ -900,7 +900,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtSlime: { - auto & Slime = reinterpret_cast<const cSlime &>(a_Mob); + auto & Slime = static_cast<const cSlime &>(a_Mob); a_Pkt.WriteBEUInt8(SLIME_SIZE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(Slime.GetSize())); @@ -909,7 +909,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtVillager: { - auto & Villager = reinterpret_cast<const cVillager &>(a_Mob); + auto & Villager = static_cast<const cVillager &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Villager.IsBaby()); @@ -922,7 +922,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtWitch: { - auto & Witch = reinterpret_cast<const cWitch &>(a_Mob); + auto & Witch = static_cast<const cWitch &>(a_Mob); a_Pkt.WriteBEUInt8(WITCH_AGGRESIVE); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Witch.IsAngry()); @@ -931,7 +931,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtWither: { - auto & Wither = reinterpret_cast<const cWither &>(a_Mob); + auto & Wither = static_cast<const cWither &>(a_Mob); a_Pkt.WriteBEUInt8(WITHER_INVULNERABLE_TIMER); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Wither.GetWitherInvulnerableTicks()); @@ -942,7 +942,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtWolf: { - auto & Wolf = reinterpret_cast<const cWolf &>(a_Mob); + auto & Wolf = static_cast<const cWolf &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Wolf.IsBaby()); @@ -980,7 +980,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtZombie: { - auto & Zombie = reinterpret_cast<const cZombie &>(a_Mob); + auto & Zombie = static_cast<const cZombie &>(a_Mob); a_Pkt.WriteBEUInt8(ZOMBIE_IS_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Zombie.IsBaby()); @@ -997,7 +997,7 @@ void cProtocol_1_10_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtZombiePigman: { - auto & ZombiePigman = reinterpret_cast<const cZombiePigman &>(a_Mob); + auto & ZombiePigman = static_cast<const cZombiePigman &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(ZombiePigman.IsBaby()); diff --git a/src/Protocol/Protocol_1_11.cpp b/src/Protocol/Protocol_1_11.cpp index f5df4e646..ebbcbade2 100644 --- a/src/Protocol/Protocol_1_11.cpp +++ b/src/Protocol/Protocol_1_11.cpp @@ -411,7 +411,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity { case E_BLOCK_BEACON: { - auto & BeaconEntity = reinterpret_cast<const cBeaconEntity &>(a_BlockEntity); + auto & BeaconEntity = static_cast<const cBeaconEntity &>(a_BlockEntity); Writer.AddInt("x", BeaconEntity.GetPosX()); Writer.AddInt("y", BeaconEntity.GetPosY()); Writer.AddInt("z", BeaconEntity.GetPosZ()); @@ -424,7 +424,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_BED: { - auto & BedEntity = reinterpret_cast<const cBedEntity &>(a_BlockEntity); + auto & BedEntity = static_cast<const cBedEntity &>(a_BlockEntity); Writer.AddInt("x", BedEntity.GetPosX()); Writer.AddInt("y", BedEntity.GetPosY()); Writer.AddInt("z", BedEntity.GetPosZ()); @@ -435,7 +435,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_COMMAND_BLOCK: { - auto & CommandBlockEntity = reinterpret_cast<const cCommandBlockEntity &>(a_BlockEntity); + auto & CommandBlockEntity = static_cast<const cCommandBlockEntity &>(a_BlockEntity); Writer.AddByte("TrackOutput", 1); // Neither I nor the MC wiki has any idea about this Writer.AddInt("SuccessCount", CommandBlockEntity.GetResult()); Writer.AddInt("x", CommandBlockEntity.GetPosX()); @@ -456,7 +456,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_HEAD: { - auto & MobHeadEntity = reinterpret_cast<const cMobHeadEntity &>(a_BlockEntity); + auto & MobHeadEntity = static_cast<const cMobHeadEntity &>(a_BlockEntity); Writer.AddInt("x", MobHeadEntity.GetPosX()); Writer.AddInt("y", MobHeadEntity.GetPosY()); Writer.AddInt("z", MobHeadEntity.GetPosZ()); @@ -482,7 +482,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_FLOWER_POT: { - auto & FlowerPotEntity = reinterpret_cast<const cFlowerPotEntity &>(a_BlockEntity); + auto & FlowerPotEntity = static_cast<const cFlowerPotEntity &>(a_BlockEntity); Writer.AddInt("x", FlowerPotEntity.GetPosX()); Writer.AddInt("y", FlowerPotEntity.GetPosY()); Writer.AddInt("z", FlowerPotEntity.GetPosZ()); @@ -494,7 +494,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity case E_BLOCK_MOB_SPAWNER: { - auto & MobSpawnerEntity = reinterpret_cast<const cMobSpawnerEntity &>(a_BlockEntity); + auto & MobSpawnerEntity = static_cast<const cMobSpawnerEntity &>(a_BlockEntity); Writer.AddInt("x", MobSpawnerEntity.GetPosX()); Writer.AddInt("y", MobSpawnerEntity.GetPosY()); Writer.AddInt("z", MobSpawnerEntity.GetPosZ()); @@ -636,7 +636,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { case cEntity::etPlayer: { - auto & Player = reinterpret_cast<const cPlayer &>(a_Entity); + auto & Player = static_cast<const cPlayer &>(a_Entity); // TODO Set player custom name to their name. // Then it's possible to move the custom name of mobs to the entities @@ -662,7 +662,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { a_Pkt.WriteBEUInt8(ITEM_ITEM); a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cPickup &>(a_Entity).GetItem()); + WriteItem(a_Pkt, static_cast<const cPickup &>(a_Entity).GetItem()); break; } case cEntity::etMinecart: @@ -671,7 +671,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); // The following expression makes Minecarts shake more with less health or higher damage taken - auto & Minecart = reinterpret_cast<const cMinecart &>(a_Entity); + auto & Minecart = static_cast<const cMinecart &>(a_Entity); auto maxHealth = a_Entity.GetMaxHealth(); auto curHealth = a_Entity.GetHealth(); a_Pkt.WriteVarInt32(static_cast<UInt32>((maxHealth - curHealth) * Minecart.LastDamage() * 4)); @@ -686,7 +686,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & if (Minecart.GetPayload() == cMinecart::mpNone) { - auto & RideableMinecart = reinterpret_cast<const cRideableMinecart &>(Minecart); + auto & RideableMinecart = static_cast<const cRideableMinecart &>(Minecart); const cItem & MinecartContent = RideableMinecart.GetContent(); if (!MinecartContent.IsEmpty()) { @@ -709,28 +709,28 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { a_Pkt.WriteBEUInt8(MINECART_FURNACE_POWERED); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); - a_Pkt.WriteBool(reinterpret_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); + a_Pkt.WriteBool(static_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); } break; } // case etMinecart case cEntity::etProjectile: { - auto & Projectile = reinterpret_cast<const cProjectileEntity &>(a_Entity); + auto & Projectile = static_cast<const cProjectileEntity &>(a_Entity); switch (Projectile.GetProjectileKind()) { case cProjectileEntity::pkArrow: { a_Pkt.WriteBEUInt8(ARROW_CRITICAL); a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); - a_Pkt.WriteBEInt8(reinterpret_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); + a_Pkt.WriteBEInt8(static_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); break; } case cProjectileEntity::pkFirework: { a_Pkt.WriteBEUInt8(FIREWORK_INFO); // Firework item used for this firework a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cFireworkEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cFireworkEntity &>(Projectile).GetItem()); // FIREWORK_BOOSTED_ENTITY_ID, in 1.11.1 only break; @@ -739,7 +739,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & { a_Pkt.WriteBEUInt8(POTION_THROWN); // Potion item which was thrown a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cSplashPotionEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cSplashPotionEntity &>(Projectile).GetItem()); } default: { @@ -751,13 +751,13 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & case cEntity::etMonster: { - WriteMobMetadata(a_Pkt, reinterpret_cast<const cMonster &>(a_Entity)); + WriteMobMetadata(a_Pkt, static_cast<const cMonster &>(a_Entity)); break; } case cEntity::etBoat: { - auto & Boat = reinterpret_cast<const cBoat &>(a_Entity); + auto & Boat = static_cast<const cBoat &>(a_Entity); a_Pkt.WriteBEInt8(BOAT_LAST_HIT_TIME); a_Pkt.WriteBEInt8(METADATA_TYPE_VARINT); @@ -788,7 +788,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & case cEntity::etItemFrame: { - auto & Frame = reinterpret_cast<const cItemFrame &>(a_Entity); + auto & Frame = static_cast<const cItemFrame &>(a_Entity); a_Pkt.WriteBEUInt8(ITEM_FRAME_ITEM); a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); WriteItem(a_Pkt, Frame.GetItem()); @@ -834,7 +834,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ { case mtBat: { - auto & Bat = reinterpret_cast<const cBat &>(a_Mob); + auto & Bat = static_cast<const cBat &>(a_Mob); a_Pkt.WriteBEUInt8(BAT_HANGING); a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); a_Pkt.WriteBEInt8(Bat.IsHanging() ? 1 : 0); @@ -843,7 +843,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtChicken: { - auto & Chicken = reinterpret_cast<const cChicken &>(a_Mob); + auto & Chicken = static_cast<const cChicken &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -853,7 +853,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtCow: { - auto & Cow = reinterpret_cast<const cCow &>(a_Mob); + auto & Cow = static_cast<const cCow &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -863,7 +863,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtCreeper: { - auto & Creeper = reinterpret_cast<const cCreeper &>(a_Mob); + auto & Creeper = static_cast<const cCreeper &>(a_Mob); a_Pkt.WriteBEUInt8(CREEPER_STATE); // (idle or "blowing") a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Creeper.IsBlowing() ? 1 : static_cast<UInt32>(-1)); @@ -880,7 +880,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtEnderman: { - auto & Enderman = reinterpret_cast<const cEnderman &>(a_Mob); + auto & Enderman = static_cast<const cEnderman &>(a_Mob); a_Pkt.WriteBEUInt8(ENDERMAN_CARRIED_BLOCK); a_Pkt.WriteBEUInt8(METADATA_TYPE_BLOCKID); UInt32 Carried = 0; @@ -896,7 +896,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtGhast: { - auto & Ghast = reinterpret_cast<const cGhast &>(a_Mob); + auto & Ghast = static_cast<const cGhast &>(a_Mob); a_Pkt.WriteBEUInt8(GHAST_ATTACKING); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Ghast.IsCharging()); @@ -908,7 +908,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ // XXX This behaves incorrectly with different varients; horses have different entity IDs now // Abstract horse - auto & Horse = reinterpret_cast<const cHorse &>(a_Mob); + auto & Horse = static_cast<const cHorse &>(a_Mob); Int8 Flags = 0; if (Horse.IsTame()) { @@ -963,7 +963,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtMagmaCube: { - auto & MagmaCube = reinterpret_cast<const cMagmaCube &>(a_Mob); + auto & MagmaCube = static_cast<const cMagmaCube &>(a_Mob); a_Pkt.WriteBEUInt8(SLIME_SIZE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(MagmaCube.GetSize())); @@ -972,7 +972,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtOcelot: { - auto & Ocelot = reinterpret_cast<const cOcelot &>(a_Mob); + auto & Ocelot = static_cast<const cOcelot &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -1000,7 +1000,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtPig: { - auto & Pig = reinterpret_cast<const cPig &>(a_Mob); + auto & Pig = static_cast<const cPig &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -1016,7 +1016,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtRabbit: { - auto & Rabbit = reinterpret_cast<const cRabbit &>(a_Mob); + auto & Rabbit = static_cast<const cRabbit &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Rabbit.IsBaby()); @@ -1029,7 +1029,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtSheep: { - auto & Sheep = reinterpret_cast<const cSheep &>(a_Mob); + auto & Sheep = static_cast<const cSheep &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -1051,7 +1051,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ { // XXX Skeletons are separate entities; all skeletons are currently treated as regular ones - // auto & Skeleton = reinterpret_cast<const cSkeleton &>(a_Mob); + // auto & Skeleton = static_cast<const cSkeleton &>(a_Mob); // a_Pkt.WriteBEUInt8(SKELETON_TYPE); // a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); // a_Pkt.WriteVarInt32(Skeleton.IsWither() ? 1 : 0); @@ -1060,7 +1060,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtSlime: { - auto & Slime = reinterpret_cast<const cSlime &>(a_Mob); + auto & Slime = static_cast<const cSlime &>(a_Mob); a_Pkt.WriteBEUInt8(SLIME_SIZE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(Slime.GetSize())); @@ -1069,7 +1069,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtVillager: { - auto & Villager = reinterpret_cast<const cVillager &>(a_Mob); + auto & Villager = static_cast<const cVillager &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Villager.IsBaby()); @@ -1082,7 +1082,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtWitch: { - auto & Witch = reinterpret_cast<const cWitch &>(a_Mob); + auto & Witch = static_cast<const cWitch &>(a_Mob); a_Pkt.WriteBEUInt8(WITCH_AGGRESIVE); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Witch.IsAngry()); @@ -1091,7 +1091,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtWither: { - auto & Wither = reinterpret_cast<const cWither &>(a_Mob); + auto & Wither = static_cast<const cWither &>(a_Mob); a_Pkt.WriteBEUInt8(WITHER_INVULNERABLE_TIMER); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Wither.GetWitherInvulnerableTicks()); @@ -1102,7 +1102,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtWolf: { - auto & Wolf = reinterpret_cast<const cWolf &>(a_Mob); + auto & Wolf = static_cast<const cWolf &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Wolf.IsBaby()); @@ -1141,7 +1141,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtZombie: { // XXX Zombies were also split into new sublcasses; this doesn't handle that. - auto & Zombie = reinterpret_cast<const cZombie &>(a_Mob); + auto & Zombie = static_cast<const cZombie &>(a_Mob); a_Pkt.WriteBEUInt8(ZOMBIE_IS_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Zombie.IsBaby()); @@ -1159,7 +1159,7 @@ void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_ case mtZombiePigman: { - auto & ZombiePigman = reinterpret_cast<const cZombiePigman &>(a_Mob); + auto & ZombiePigman = static_cast<const cZombiePigman &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(ZombiePigman.IsBaby()); diff --git a/src/Protocol/Protocol_1_12.cpp b/src/Protocol/Protocol_1_12.cpp index a3d1952ed..bb6f7f6ba 100644 --- a/src/Protocol/Protocol_1_12.cpp +++ b/src/Protocol/Protocol_1_12.cpp @@ -449,7 +449,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ { case cEntity::etPlayer: { - auto & Player = reinterpret_cast<const cPlayer &>(a_Entity); + auto & Player = static_cast<const cPlayer &>(a_Entity); // TODO Set player custom name to their name. // Then it's possible to move the custom name of mobs to the entities @@ -475,7 +475,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ { a_Pkt.WriteBEUInt8(ITEM_ITEM); a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cPickup &>(a_Entity).GetItem()); + WriteItem(a_Pkt, static_cast<const cPickup &>(a_Entity).GetItem()); break; } case cEntity::etMinecart: @@ -484,7 +484,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); // The following expression makes Minecarts shake more with less health or higher damage taken - auto & Minecart = reinterpret_cast<const cMinecart &>(a_Entity); + auto & Minecart = static_cast<const cMinecart &>(a_Entity); auto maxHealth = a_Entity.GetMaxHealth(); auto curHealth = a_Entity.GetHealth(); a_Pkt.WriteVarInt32(static_cast<UInt32>((maxHealth - curHealth) * Minecart.LastDamage() * 4)); @@ -499,7 +499,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ if (Minecart.GetPayload() == cMinecart::mpNone) { - auto & RideableMinecart = reinterpret_cast<const cRideableMinecart &>(Minecart); + auto & RideableMinecart = static_cast<const cRideableMinecart &>(Minecart); const cItem & MinecartContent = RideableMinecart.GetContent(); if (!MinecartContent.IsEmpty()) { @@ -522,28 +522,28 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ { a_Pkt.WriteBEUInt8(MINECART_FURNACE_POWERED); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); - a_Pkt.WriteBool(reinterpret_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); + a_Pkt.WriteBool(static_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); } break; } // case etMinecart case cEntity::etProjectile: { - auto & Projectile = reinterpret_cast<const cProjectileEntity &>(a_Entity); + auto & Projectile = static_cast<const cProjectileEntity &>(a_Entity); switch (Projectile.GetProjectileKind()) { case cProjectileEntity::pkArrow: { a_Pkt.WriteBEUInt8(ARROW_CRITICAL); a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); - a_Pkt.WriteBEInt8(reinterpret_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); + a_Pkt.WriteBEInt8(static_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); break; } case cProjectileEntity::pkFirework: { a_Pkt.WriteBEUInt8(FIREWORK_INFO); // Firework item used for this firework a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cFireworkEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cFireworkEntity &>(Projectile).GetItem()); // FIREWORK_BOOSTED_ENTITY_ID, in 1.11.1 only break; @@ -552,7 +552,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ { a_Pkt.WriteBEUInt8(POTION_THROWN); // Potion item which was thrown a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cSplashPotionEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cSplashPotionEntity &>(Projectile).GetItem()); } default: { @@ -564,13 +564,13 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ case cEntity::etMonster: { - WriteMobMetadata(a_Pkt, reinterpret_cast<const cMonster &>(a_Entity)); + WriteMobMetadata(a_Pkt, static_cast<const cMonster &>(a_Entity)); break; } case cEntity::etBoat: { - auto & Boat = reinterpret_cast<const cBoat &>(a_Entity); + auto & Boat = static_cast<const cBoat &>(a_Entity); a_Pkt.WriteBEInt8(BOAT_LAST_HIT_TIME); a_Pkt.WriteBEInt8(METADATA_TYPE_VARINT); @@ -601,7 +601,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_ case cEntity::etItemFrame: { - auto & Frame = reinterpret_cast<const cItemFrame &>(a_Entity); + auto & Frame = static_cast<const cItemFrame &>(a_Entity); a_Pkt.WriteBEUInt8(ITEM_FRAME_ITEM); a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); WriteItem(a_Pkt, Frame.GetItem()); @@ -647,7 +647,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo { case mtBat: { - auto & Bat = reinterpret_cast<const cBat &>(a_Mob); + auto & Bat = static_cast<const cBat &>(a_Mob); a_Pkt.WriteBEUInt8(BAT_HANGING); a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); a_Pkt.WriteBEInt8(Bat.IsHanging() ? 1 : 0); @@ -656,7 +656,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtChicken: { - auto & Chicken = reinterpret_cast<const cChicken &>(a_Mob); + auto & Chicken = static_cast<const cChicken &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -666,7 +666,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtCow: { - auto & Cow = reinterpret_cast<const cCow &>(a_Mob); + auto & Cow = static_cast<const cCow &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -676,7 +676,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtCreeper: { - auto & Creeper = reinterpret_cast<const cCreeper &>(a_Mob); + auto & Creeper = static_cast<const cCreeper &>(a_Mob); a_Pkt.WriteBEUInt8(CREEPER_STATE); // (idle or "blowing") a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Creeper.IsBlowing() ? 1 : static_cast<UInt32>(-1)); @@ -693,7 +693,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtEnderman: { - auto & Enderman = reinterpret_cast<const cEnderman &>(a_Mob); + auto & Enderman = static_cast<const cEnderman &>(a_Mob); a_Pkt.WriteBEUInt8(ENDERMAN_CARRIED_BLOCK); a_Pkt.WriteBEUInt8(METADATA_TYPE_BLOCKID); UInt32 Carried = 0; @@ -709,7 +709,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtGhast: { - auto & Ghast = reinterpret_cast<const cGhast &>(a_Mob); + auto & Ghast = static_cast<const cGhast &>(a_Mob); a_Pkt.WriteBEUInt8(GHAST_ATTACKING); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Ghast.IsCharging()); @@ -721,7 +721,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo // XXX This behaves incorrectly with different varients; horses have different entity IDs now // Abstract horse - auto & Horse = reinterpret_cast<const cHorse &>(a_Mob); + auto & Horse = static_cast<const cHorse &>(a_Mob); Int8 Flags = 0; if (Horse.IsTame()) { @@ -776,7 +776,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtMagmaCube: { - auto & MagmaCube = reinterpret_cast<const cMagmaCube &>(a_Mob); + auto & MagmaCube = static_cast<const cMagmaCube &>(a_Mob); a_Pkt.WriteBEUInt8(SLIME_SIZE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(MagmaCube.GetSize())); @@ -785,7 +785,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtOcelot: { - auto & Ocelot = reinterpret_cast<const cOcelot &>(a_Mob); + auto & Ocelot = static_cast<const cOcelot &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -813,7 +813,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtPig: { - auto & Pig = reinterpret_cast<const cPig &>(a_Mob); + auto & Pig = static_cast<const cPig &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -829,7 +829,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtRabbit: { - auto & Rabbit = reinterpret_cast<const cRabbit &>(a_Mob); + auto & Rabbit = static_cast<const cRabbit &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Rabbit.IsBaby()); @@ -842,7 +842,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtSheep: { - auto & Sheep = reinterpret_cast<const cSheep &>(a_Mob); + auto & Sheep = static_cast<const cSheep &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -864,7 +864,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo { // XXX Skeletons are separate entities; all skeletons are currently treated as regular ones - // auto & Skeleton = reinterpret_cast<const cSkeleton &>(a_Mob); + // auto & Skeleton = static_cast<const cSkeleton &>(a_Mob); // a_Pkt.WriteBEUInt8(SKELETON_TYPE); // a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); // a_Pkt.WriteVarInt32(Skeleton.IsWither() ? 1 : 0); @@ -873,7 +873,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtSlime: { - auto & Slime = reinterpret_cast<const cSlime &>(a_Mob); + auto & Slime = static_cast<const cSlime &>(a_Mob); a_Pkt.WriteBEUInt8(SLIME_SIZE); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(Slime.GetSize())); @@ -882,7 +882,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtVillager: { - auto & Villager = reinterpret_cast<const cVillager &>(a_Mob); + auto & Villager = static_cast<const cVillager &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Villager.IsBaby()); @@ -895,7 +895,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtWitch: { - auto & Witch = reinterpret_cast<const cWitch &>(a_Mob); + auto & Witch = static_cast<const cWitch &>(a_Mob); a_Pkt.WriteBEUInt8(WITCH_AGGRESIVE); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Witch.IsAngry()); @@ -904,7 +904,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtWither: { - auto & Wither = reinterpret_cast<const cWither &>(a_Mob); + auto & Wither = static_cast<const cWither &>(a_Mob); a_Pkt.WriteBEUInt8(WITHER_INVULNERABLE_TIMER); a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Wither.GetWitherInvulnerableTicks()); @@ -915,7 +915,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtWolf: { - auto & Wolf = reinterpret_cast<const cWolf &>(a_Mob); + auto & Wolf = static_cast<const cWolf &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Wolf.IsBaby()); @@ -954,7 +954,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtZombie: { // XXX Zombies were also split into new sublcasses; this doesn't handle that. - auto & Zombie = reinterpret_cast<const cZombie &>(a_Mob); + auto & Zombie = static_cast<const cZombie &>(a_Mob); a_Pkt.WriteBEUInt8(ZOMBIE_IS_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Zombie.IsBaby()); @@ -972,7 +972,7 @@ void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mo case mtZombiePigman: { - auto & ZombiePigman = reinterpret_cast<const cZombiePigman &>(a_Mob); + auto & ZombiePigman = static_cast<const cZombiePigman &>(a_Mob); a_Pkt.WriteBEUInt8(AGEABLE_BABY); a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(ZombiePigman.IsBaby()); diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp index 41e168c95..58f067278 100644 --- a/src/Protocol/Protocol_1_8.cpp +++ b/src/Protocol/Protocol_1_8.cpp @@ -2842,7 +2842,7 @@ void cProtocol_1_8_0::SendData(const char * a_Data, size_t a_Size) while (a_Size > 0) { size_t NumBytes = (a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : a_Size; - m_Encryptor.ProcessData(Encrypted, reinterpret_cast<Byte *>(const_cast<char*>(a_Data)), NumBytes); + m_Encryptor.ProcessData(Encrypted, reinterpret_cast<const Byte *>(a_Data), NumBytes); m_Client->SendData(reinterpret_cast<const char *>(Encrypted), NumBytes); a_Size -= NumBytes; a_Data += NumBytes; @@ -3161,7 +3161,7 @@ void cProtocol_1_8_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & { case E_BLOCK_BEACON: { - auto & BeaconEntity = reinterpret_cast<const cBeaconEntity &>(a_BlockEntity); + auto & BeaconEntity = static_cast<const cBeaconEntity &>(a_BlockEntity); Writer.AddInt("x", BeaconEntity.GetPosX()); Writer.AddInt("y", BeaconEntity.GetPosY()); Writer.AddInt("z", BeaconEntity.GetPosZ()); @@ -3174,7 +3174,7 @@ void cProtocol_1_8_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_COMMAND_BLOCK: { - auto & CommandBlockEntity = reinterpret_cast<const cCommandBlockEntity &>(a_BlockEntity); + auto & CommandBlockEntity = static_cast<const cCommandBlockEntity &>(a_BlockEntity); Writer.AddByte("TrackOutput", 1); // Neither I nor the MC wiki has any idea about this Writer.AddInt("SuccessCount", CommandBlockEntity.GetResult()); Writer.AddInt("x", CommandBlockEntity.GetPosX()); @@ -3195,7 +3195,7 @@ void cProtocol_1_8_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_HEAD: { - auto & MobHeadEntity = reinterpret_cast<const cMobHeadEntity &>(a_BlockEntity); + auto & MobHeadEntity = static_cast<const cMobHeadEntity &>(a_BlockEntity); Writer.AddInt("x", MobHeadEntity.GetPosX()); Writer.AddInt("y", MobHeadEntity.GetPosY()); Writer.AddInt("z", MobHeadEntity.GetPosZ()); @@ -3221,7 +3221,7 @@ void cProtocol_1_8_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_FLOWER_POT: { - auto & FlowerPotEntity = reinterpret_cast<const cFlowerPotEntity &>(a_BlockEntity); + auto & FlowerPotEntity = static_cast<const cFlowerPotEntity &>(a_BlockEntity); Writer.AddInt("x", FlowerPotEntity.GetPosX()); Writer.AddInt("y", FlowerPotEntity.GetPosY()); Writer.AddInt("z", FlowerPotEntity.GetPosZ()); @@ -3233,7 +3233,7 @@ void cProtocol_1_8_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_MOB_SPAWNER: { - auto & MobSpawnerEntity = reinterpret_cast<const cMobSpawnerEntity &>(a_BlockEntity); + auto & MobSpawnerEntity = static_cast<const cMobSpawnerEntity &>(a_BlockEntity); Writer.AddInt("x", MobSpawnerEntity.GetPosX()); Writer.AddInt("y", MobSpawnerEntity.GetPosY()); Writer.AddInt("z", MobSpawnerEntity.GetPosZ()); @@ -3288,7 +3288,7 @@ void cProtocol_1_8_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a { case cEntity::etPlayer: { - auto & Player = reinterpret_cast<const cPlayer &>(a_Entity); + auto & Player = static_cast<const cPlayer &>(a_Entity); // Player health (not handled since players aren't monsters) a_Pkt.WriteBEUInt8(0x66); @@ -3303,7 +3303,7 @@ void cProtocol_1_8_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a case cEntity::etPickup: { a_Pkt.WriteBEUInt8((5 << 5) | 10); // Slot(5) + index 10 - WriteItem(a_Pkt, reinterpret_cast<const cPickup &>(a_Entity).GetItem()); + WriteItem(a_Pkt, static_cast<const cPickup &>(a_Entity).GetItem()); break; } case cEntity::etMinecart: @@ -3317,7 +3317,7 @@ void cProtocol_1_8_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a Health: 3 | 3 - (3 - 3) = 3 Health: 1 | 3 - (1 - 3) = 5 */ - auto & Minecart = reinterpret_cast<const cMinecart &>(a_Entity); + auto & Minecart = static_cast<const cMinecart &>(a_Entity); a_Pkt.WriteBEInt32(static_cast<Int32>((((a_Entity.GetMaxHealth() / 2) - (a_Entity.GetHealth() - (a_Entity.GetMaxHealth() / 2))) * Minecart.LastDamage()) * 4)); a_Pkt.WriteBEUInt8(0x52); a_Pkt.WriteBEInt32(1); // Shaking direction, doesn't seem to affect anything @@ -3326,7 +3326,7 @@ void cProtocol_1_8_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a if (Minecart.GetPayload() == cMinecart::mpNone) { - auto & RideableMinecart = reinterpret_cast<const cRideableMinecart &>(Minecart); + auto & RideableMinecart = static_cast<const cRideableMinecart &>(Minecart); const cItem & MinecartContent = RideableMinecart.GetContent(); if (!MinecartContent.IsEmpty()) { @@ -3343,26 +3343,26 @@ void cProtocol_1_8_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a else if (Minecart.GetPayload() == cMinecart::mpFurnace) { a_Pkt.WriteBEUInt8(0x10); - a_Pkt.WriteBEUInt8(reinterpret_cast<const cMinecartWithFurnace &>(Minecart).IsFueled() ? 1 : 0); + a_Pkt.WriteBEUInt8(static_cast<const cMinecartWithFurnace &>(Minecart).IsFueled() ? 1 : 0); } break; } // case etMinecart case cEntity::etProjectile: { - auto & Projectile = reinterpret_cast<const cProjectileEntity &>(a_Entity); + auto & Projectile = static_cast<const cProjectileEntity &>(a_Entity); switch (Projectile.GetProjectileKind()) { case cProjectileEntity::pkArrow: { a_Pkt.WriteBEUInt8(0x10); - a_Pkt.WriteBEUInt8(reinterpret_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); + a_Pkt.WriteBEUInt8(static_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); break; } case cProjectileEntity::pkFirework: { a_Pkt.WriteBEUInt8(0xa8); - WriteItem(a_Pkt, reinterpret_cast<const cFireworkEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cFireworkEntity &>(Projectile).GetItem()); break; } default: @@ -3375,13 +3375,13 @@ void cProtocol_1_8_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a case cEntity::etMonster: { - WriteMobMetadata(a_Pkt, reinterpret_cast<const cMonster &>(a_Entity)); + WriteMobMetadata(a_Pkt, static_cast<const cMonster &>(a_Entity)); break; } case cEntity::etItemFrame: { - auto & Frame = reinterpret_cast<const cItemFrame &>(a_Entity); + auto & Frame = static_cast<const cItemFrame &>(a_Entity); a_Pkt.WriteBEUInt8(0xa8); WriteItem(a_Pkt, Frame.GetItem()); a_Pkt.WriteBEUInt8(0x09); @@ -3419,7 +3419,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M { case mtBat: { - auto & Bat = reinterpret_cast<const cBat &>(a_Mob); + auto & Bat = static_cast<const cBat &>(a_Mob); a_Pkt.WriteBEUInt8(0x10); a_Pkt.WriteBEUInt8(Bat.IsHanging() ? 1 : 0); break; @@ -3427,7 +3427,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtChicken: { - auto & Chicken = reinterpret_cast<const cChicken &>(a_Mob); + auto & Chicken = static_cast<const cChicken &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(Chicken.IsBaby() ? -1 : (Chicken.IsInLoveCooldown() ? 1 : 0)); break; @@ -3435,7 +3435,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtCow: { - auto & Cow = reinterpret_cast<const cCow &>(a_Mob); + auto & Cow = static_cast<const cCow &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(Cow.IsBaby() ? -1 : (Cow.IsInLoveCooldown() ? 1 : 0)); break; @@ -3443,7 +3443,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtCreeper: { - auto & Creeper = reinterpret_cast<const cCreeper &>(a_Mob); + auto & Creeper = static_cast<const cCreeper &>(a_Mob); a_Pkt.WriteBEUInt8(0x10); a_Pkt.WriteBEUInt8(Creeper.IsBlowing() ? 1 : 255); a_Pkt.WriteBEUInt8(0x11); @@ -3453,7 +3453,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtEnderman: { - auto & Enderman = reinterpret_cast<const cEnderman &>(a_Mob); + auto & Enderman = static_cast<const cEnderman &>(a_Mob); a_Pkt.WriteBEUInt8(0x30); a_Pkt.WriteBEInt16(static_cast<Byte>(Enderman.GetCarriedBlock())); a_Pkt.WriteBEUInt8(0x11); @@ -3465,7 +3465,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtGhast: { - auto & Ghast = reinterpret_cast<const cGhast &>(a_Mob); + auto & Ghast = static_cast<const cGhast &>(a_Mob); a_Pkt.WriteBEUInt8(0x10); a_Pkt.WriteBEUInt8(Ghast.IsCharging()); break; @@ -3473,7 +3473,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtHorse: { - auto & Horse = reinterpret_cast<const cHorse &>(a_Mob); + auto & Horse = static_cast<const cHorse &>(a_Mob); int Flags = 0; if (Horse.IsTame()) { @@ -3517,7 +3517,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtMagmaCube: { - auto & MagmaCube = reinterpret_cast<const cMagmaCube &>(a_Mob); + auto & MagmaCube = static_cast<const cMagmaCube &>(a_Mob); a_Pkt.WriteBEUInt8(0x10); a_Pkt.WriteBEUInt8(static_cast<UInt8>(MagmaCube.GetSize())); break; @@ -3525,7 +3525,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtOcelot: { - auto & Ocelot = reinterpret_cast<const cOcelot &>(a_Mob); + auto & Ocelot = static_cast<const cOcelot &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(Ocelot.IsBaby() ? -1 : (Ocelot.IsInLoveCooldown() ? 1 : 0)); break; @@ -3533,7 +3533,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtPig: { - auto & Pig = reinterpret_cast<const cPig &>(a_Mob); + auto & Pig = static_cast<const cPig &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(Pig.IsBaby() ? -1 : (Pig.IsInLoveCooldown() ? 1 : 0)); a_Pkt.WriteBEUInt8(0x10); @@ -3543,7 +3543,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtSheep: { - auto & Sheep = reinterpret_cast<const cSheep &>(a_Mob); + auto & Sheep = static_cast<const cSheep &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(Sheep.IsBaby() ? -1 : (Sheep.IsInLoveCooldown() ? 1 : 0)); @@ -3560,7 +3560,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtRabbit: { - auto & Rabbit = reinterpret_cast<const cRabbit &>(a_Mob); + auto & Rabbit = static_cast<const cRabbit &>(a_Mob); a_Pkt.WriteBEUInt8(0x12); a_Pkt.WriteBEUInt8(static_cast<UInt8>(Rabbit.GetRabbitType())); a_Pkt.WriteBEUInt8(0x0c); @@ -3570,7 +3570,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtSkeleton: { - auto & Skeleton = reinterpret_cast<const cSkeleton &>(a_Mob); + auto & Skeleton = static_cast<const cSkeleton &>(a_Mob); a_Pkt.WriteBEUInt8(0x0d); a_Pkt.WriteBEUInt8(Skeleton.IsWither() ? 1 : 0); break; @@ -3578,7 +3578,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtSlime: { - auto & Slime = reinterpret_cast<const cSlime &>(a_Mob); + auto & Slime = static_cast<const cSlime &>(a_Mob); a_Pkt.WriteBEUInt8(0x10); a_Pkt.WriteBEUInt8(static_cast<UInt8>(Slime.GetSize())); break; @@ -3586,7 +3586,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtVillager: { - auto & Villager = reinterpret_cast<const cVillager &>(a_Mob); + auto & Villager = static_cast<const cVillager &>(a_Mob); a_Pkt.WriteBEUInt8(0x50); a_Pkt.WriteBEInt32(Villager.GetVilType()); a_Pkt.WriteBEUInt8(0x0c); @@ -3596,7 +3596,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtWitch: { - auto & Witch = reinterpret_cast<const cWitch &>(a_Mob); + auto & Witch = static_cast<const cWitch &>(a_Mob); a_Pkt.WriteBEUInt8(0x15); a_Pkt.WriteBEUInt8(Witch.IsAngry() ? 1 : 0); break; @@ -3604,7 +3604,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtWither: { - auto & Wither = reinterpret_cast<const cWither &>(a_Mob); + auto & Wither = static_cast<const cWither &>(a_Mob); a_Pkt.WriteBEUInt8(0x54); // Int at index 20 a_Pkt.WriteBEInt32(static_cast<Int32>(Wither.GetWitherInvulnerableTicks())); a_Pkt.WriteBEUInt8(0x66); // Float at index 6 @@ -3614,7 +3614,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtWolf: { - auto & Wolf = reinterpret_cast<const cWolf &>(a_Mob); + auto & Wolf = static_cast<const cWolf &>(a_Mob); Byte WolfStatus = 0; if (Wolf.IsSitting()) { @@ -3644,7 +3644,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtZombie: { - auto & Zombie = reinterpret_cast<const cZombie &>(a_Mob); + auto & Zombie = static_cast<const cZombie &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(Zombie.IsBaby() ? 1 : -1); a_Pkt.WriteBEUInt8(0x0d); @@ -3656,7 +3656,7 @@ void cProtocol_1_8_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtZombiePigman: { - auto & ZombiePigman = reinterpret_cast<const cZombiePigman &>(a_Mob); + auto & ZombiePigman = static_cast<const cZombiePigman &>(a_Mob); a_Pkt.WriteBEUInt8(0x0c); a_Pkt.WriteBEInt8(ZombiePigman.IsBaby() ? 1 : -1); break; diff --git a/src/Protocol/Protocol_1_9.cpp b/src/Protocol/Protocol_1_9.cpp index 3e600cefd..64721ed04 100644 --- a/src/Protocol/Protocol_1_9.cpp +++ b/src/Protocol/Protocol_1_9.cpp @@ -2405,7 +2405,7 @@ void cProtocol_1_9_0::HandlePacketBoatSteer(cByteBuffer & a_ByteBuffer) { if (Vehicle->GetEntityType() == cEntity::etBoat) { - auto * Boat = reinterpret_cast<cBoat *>(Vehicle); + auto * Boat = static_cast<cBoat *>(Vehicle); Boat->UpdatePaddles(RightPaddle, LeftPaddle); } } @@ -2970,7 +2970,7 @@ void cProtocol_1_9_0::SendData(const char * a_Data, size_t a_Size) while (a_Size > 0) { size_t NumBytes = (a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : a_Size; - m_Encryptor.ProcessData(Encrypted, reinterpret_cast<Byte *>(const_cast<char*>(a_Data)), NumBytes); + m_Encryptor.ProcessData(Encrypted, reinterpret_cast<const Byte *>(a_Data), NumBytes); m_Client->SendData(reinterpret_cast<const char *>(Encrypted), NumBytes); a_Size -= NumBytes; a_Data += NumBytes; @@ -3527,7 +3527,7 @@ void cProtocol_1_9_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & { case E_BLOCK_BEACON: { - auto & BeaconEntity = reinterpret_cast<const cBeaconEntity &>(a_BlockEntity); + auto & BeaconEntity = static_cast<const cBeaconEntity &>(a_BlockEntity); Writer.AddInt("x", BeaconEntity.GetPosX()); Writer.AddInt("y", BeaconEntity.GetPosY()); Writer.AddInt("z", BeaconEntity.GetPosZ()); @@ -3540,7 +3540,7 @@ void cProtocol_1_9_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_COMMAND_BLOCK: { - auto & CommandBlockEntity = reinterpret_cast<const cCommandBlockEntity &>(a_BlockEntity); + auto & CommandBlockEntity = static_cast<const cCommandBlockEntity &>(a_BlockEntity); Writer.AddByte("TrackOutput", 1); // Neither I nor the MC wiki has any idea about this Writer.AddInt("SuccessCount", CommandBlockEntity.GetResult()); Writer.AddInt("x", CommandBlockEntity.GetPosX()); @@ -3561,7 +3561,7 @@ void cProtocol_1_9_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_HEAD: { - auto & MobHeadEntity = reinterpret_cast<const cMobHeadEntity &>(a_BlockEntity); + auto & MobHeadEntity = static_cast<const cMobHeadEntity &>(a_BlockEntity); Writer.AddInt("x", MobHeadEntity.GetPosX()); Writer.AddInt("y", MobHeadEntity.GetPosY()); Writer.AddInt("z", MobHeadEntity.GetPosZ()); @@ -3587,7 +3587,7 @@ void cProtocol_1_9_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_FLOWER_POT: { - auto & FlowerPotEntity = reinterpret_cast<const cFlowerPotEntity &>(a_BlockEntity); + auto & FlowerPotEntity = static_cast<const cFlowerPotEntity &>(a_BlockEntity); Writer.AddInt("x", FlowerPotEntity.GetPosX()); Writer.AddInt("y", FlowerPotEntity.GetPosY()); Writer.AddInt("z", FlowerPotEntity.GetPosZ()); @@ -3599,7 +3599,7 @@ void cProtocol_1_9_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity & case E_BLOCK_MOB_SPAWNER: { - auto & MobSpawnerEntity = reinterpret_cast<const cMobSpawnerEntity &>(a_BlockEntity); + auto & MobSpawnerEntity = static_cast<const cMobSpawnerEntity &>(a_BlockEntity); Writer.AddInt("x", MobSpawnerEntity.GetPosX()); Writer.AddInt("y", MobSpawnerEntity.GetPosY()); Writer.AddInt("z", MobSpawnerEntity.GetPosZ()); @@ -3657,7 +3657,7 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a { case cEntity::etPlayer: { - auto & Player = reinterpret_cast<const cPlayer &>(a_Entity); + auto & Player = static_cast<const cPlayer &>(a_Entity); // TODO Set player custom name to their name. // Then it's possible to move the custom name of mobs to the entities @@ -3683,7 +3683,7 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a { a_Pkt.WriteBEUInt8(5); // Index 5: Item a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cPickup &>(a_Entity).GetItem()); + WriteItem(a_Pkt, static_cast<const cPickup &>(a_Entity).GetItem()); break; } case cEntity::etMinecart: @@ -3692,7 +3692,7 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); // The following expression makes Minecarts shake more with less health or higher damage taken - auto & Minecart = reinterpret_cast<const cMinecart &>(a_Entity); + auto & Minecart = static_cast<const cMinecart &>(a_Entity); auto maxHealth = a_Entity.GetMaxHealth(); auto curHealth = a_Entity.GetHealth(); a_Pkt.WriteVarInt32(static_cast<UInt32>((maxHealth - curHealth) * Minecart.LastDamage() * 4)); @@ -3707,7 +3707,7 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a if (Minecart.GetPayload() == cMinecart::mpNone) { - auto & RideableMinecart = reinterpret_cast<const cRideableMinecart &>(Minecart); + auto & RideableMinecart = static_cast<const cRideableMinecart &>(Minecart); const cItem & MinecartContent = RideableMinecart.GetContent(); if (!MinecartContent.IsEmpty()) { @@ -3730,35 +3730,35 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a { a_Pkt.WriteBEUInt8(11); // Index 11: Is powered a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); - a_Pkt.WriteBool(reinterpret_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); + a_Pkt.WriteBool(static_cast<const cMinecartWithFurnace &>(Minecart).IsFueled()); } break; } // case etMinecart case cEntity::etProjectile: { - auto & Projectile = reinterpret_cast<const cProjectileEntity &>(a_Entity); + auto & Projectile = static_cast<const cProjectileEntity &>(a_Entity); switch (Projectile.GetProjectileKind()) { case cProjectileEntity::pkArrow: { a_Pkt.WriteBEUInt8(5); // Index 5: Is critical a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); - a_Pkt.WriteBEInt8(reinterpret_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); + a_Pkt.WriteBEInt8(static_cast<const cArrowEntity &>(Projectile).IsCritical() ? 1 : 0); break; } case cProjectileEntity::pkFirework: { a_Pkt.WriteBEUInt8(5); // Index 5: Firework item used for this firework a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cFireworkEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cFireworkEntity &>(Projectile).GetItem()); break; } case cProjectileEntity::pkSplashPotion: { a_Pkt.WriteBEUInt8(5); // Index 5: Potion item which was thrown a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); - WriteItem(a_Pkt, reinterpret_cast<const cSplashPotionEntity &>(Projectile).GetItem()); + WriteItem(a_Pkt, static_cast<const cSplashPotionEntity &>(Projectile).GetItem()); } default: { @@ -3770,13 +3770,13 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a case cEntity::etMonster: { - WriteMobMetadata(a_Pkt, reinterpret_cast<const cMonster &>(a_Entity)); + WriteMobMetadata(a_Pkt, static_cast<const cMonster &>(a_Entity)); break; } case cEntity::etBoat: { - auto & Boat = reinterpret_cast<const cBoat &>(a_Entity); + auto & Boat = static_cast<const cBoat &>(a_Entity); a_Pkt.WriteBEInt8(5); // Index 6: Time since last hit a_Pkt.WriteBEInt8(METADATA_TYPE_VARINT); @@ -3807,7 +3807,7 @@ void cProtocol_1_9_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a case cEntity::etItemFrame: { - auto & Frame = reinterpret_cast<const cItemFrame &>(a_Entity); + auto & Frame = static_cast<const cItemFrame &>(a_Entity); a_Pkt.WriteBEUInt8(5); // Index 5: Item a_Pkt.WriteBEUInt8(METADATA_TYPE_ITEM); WriteItem(a_Pkt, Frame.GetItem()); @@ -3851,7 +3851,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M { case mtBat: { - auto & Bat = reinterpret_cast<const cBat &>(a_Mob); + auto & Bat = static_cast<const cBat &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Bat flags - currently only hanging a_Pkt.WriteBEUInt8(METADATA_TYPE_BYTE); a_Pkt.WriteBEInt8(Bat.IsHanging() ? 1 : 0); @@ -3860,7 +3860,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtChicken: { - auto & Chicken = reinterpret_cast<const cChicken &>(a_Mob); + auto & Chicken = static_cast<const cChicken &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -3870,7 +3870,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtCow: { - auto & Cow = reinterpret_cast<const cCow &>(a_Mob); + auto & Cow = static_cast<const cCow &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -3880,7 +3880,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtCreeper: { - auto & Creeper = reinterpret_cast<const cCreeper &>(a_Mob); + auto & Creeper = static_cast<const cCreeper &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: State (idle or "blowing") a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Creeper.IsBlowing() ? 1 : 0xffffffff); @@ -3897,7 +3897,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtEnderman: { - auto & Enderman = reinterpret_cast<const cEnderman &>(a_Mob); + auto & Enderman = static_cast<const cEnderman &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Carried block a_Pkt.WriteBEUInt8(METADATA_TYPE_BLOCKID); UInt32 Carried = 0; @@ -3913,7 +3913,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtGhast: { - auto & Ghast = reinterpret_cast<const cGhast &>(a_Mob); + auto & Ghast = static_cast<const cGhast &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Is attacking a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Ghast.IsCharging()); @@ -3922,7 +3922,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtHorse: { - auto & Horse = reinterpret_cast<const cHorse &>(a_Mob); + auto & Horse = static_cast<const cHorse &>(a_Mob); Int8 Flags = 0; if (Horse.IsTame()) { @@ -3975,7 +3975,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtMagmaCube: { - auto & MagmaCube = reinterpret_cast<const cMagmaCube &>(a_Mob); + auto & MagmaCube = static_cast<const cMagmaCube &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Size a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(MagmaCube.GetSize())); @@ -3984,7 +3984,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtOcelot: { - auto & Ocelot = reinterpret_cast<const cOcelot &>(a_Mob); + auto & Ocelot = static_cast<const cOcelot &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -3994,7 +3994,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtPig: { - auto & Pig = reinterpret_cast<const cPig &>(a_Mob); + auto & Pig = static_cast<const cPig &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -4009,7 +4009,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtRabbit: { - auto & Rabbit = reinterpret_cast<const cRabbit &>(a_Mob); + auto & Rabbit = static_cast<const cRabbit &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Rabbit.IsBaby()); @@ -4022,7 +4022,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtSheep: { - auto & Sheep = reinterpret_cast<const cSheep &>(a_Mob); + auto & Sheep = static_cast<const cSheep &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); @@ -4042,7 +4042,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtSkeleton: { - auto & Skeleton = reinterpret_cast<const cSkeleton &>(a_Mob); + auto & Skeleton = static_cast<const cSkeleton &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Type a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Skeleton.IsWither() ? 1 : 0); @@ -4051,7 +4051,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtSlime: { - auto & Slime = reinterpret_cast<const cSlime &>(a_Mob); + auto & Slime = static_cast<const cSlime &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Size a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(static_cast<UInt32>(Slime.GetSize())); @@ -4060,7 +4060,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtVillager: { - auto & Villager = reinterpret_cast<const cVillager &>(a_Mob); + auto & Villager = static_cast<const cVillager &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Villager.IsBaby()); @@ -4073,7 +4073,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtWitch: { - auto & Witch = reinterpret_cast<const cWitch &>(a_Mob); + auto & Witch = static_cast<const cWitch &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is angry a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Witch.IsAngry()); @@ -4082,7 +4082,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtWither: { - auto & Wither = reinterpret_cast<const cWither &>(a_Mob); + auto & Wither = static_cast<const cWither &>(a_Mob); a_Pkt.WriteBEUInt8(14); // Index 14: Invulnerable ticks a_Pkt.WriteBEUInt8(METADATA_TYPE_VARINT); a_Pkt.WriteVarInt32(Wither.GetWitherInvulnerableTicks()); @@ -4093,7 +4093,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtWolf: { - auto & Wolf = reinterpret_cast<const cWolf &>(a_Mob); + auto & Wolf = static_cast<const cWolf &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Wolf.IsBaby()); @@ -4131,7 +4131,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtZombie: { - auto & Zombie = reinterpret_cast<const cZombie &>(a_Mob); + auto & Zombie = static_cast<const cZombie &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(Zombie.IsBaby()); @@ -4148,7 +4148,7 @@ void cProtocol_1_9_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_M case mtZombiePigman: { - auto & ZombiePigman = reinterpret_cast<const cZombiePigman &>(a_Mob); + auto & ZombiePigman = static_cast<const cZombiePigman &>(a_Mob); a_Pkt.WriteBEUInt8(11); // Index 11: Is baby a_Pkt.WriteBEUInt8(METADATA_TYPE_BOOL); a_Pkt.WriteBool(ZombiePigman.IsBaby()); |