From 7ae0c13854d94ac2153cd3bb05ce18044b7cf8bb Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:36:56 +0700 Subject: Revert "dynamic_pointer_cast -> std::dynamic_pointer_cast" This reverts commit 07ad68bc156b3ab70401723bb074a29588ad3cb7. --- Minecraft.Client/TrackedEntity.cpp | 88 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'Minecraft.Client/TrackedEntity.cpp') diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp index db6a653d..c372bdaf 100644 --- a/Minecraft.Client/TrackedEntity.cpp +++ b/Minecraft.Client/TrackedEntity.cpp @@ -68,7 +68,7 @@ void TrackedEntity::tick(EntityTracker *tracker, vector // Moving forward special case for item frames if (e->GetType()== eTYPE_ITEM_FRAME && tickCount % 10 == 0) { - std::shared_ptr frame = std::dynamic_pointer_cast (e); + std::shared_ptr frame = dynamic_pointer_cast (e); std::shared_ptr item = frame->getItem(); if (item != NULL && item->getItem()->id == Item::map_Id && !e->removed) @@ -76,7 +76,7 @@ void TrackedEntity::tick(EntityTracker *tracker, vector std::shared_ptr data = Item::map->getSavedData(item, e->level); for (AUTO_VAR(it,players->begin() ); it != players->end(); ++it) { - std::shared_ptr player = std::dynamic_pointer_cast(*it); + std::shared_ptr player = dynamic_pointer_cast(*it); data->tickCarriedBy(player, item); if (!player->removed && player->connection && player->connection->countDelayedPackets() <= 5) @@ -276,7 +276,7 @@ void TrackedEntity::tick(EntityTracker *tracker, vector xRotp = xRotn; } - // if( std::dynamic_pointer_cast(e) != NULL ) + // if( dynamic_pointer_cast(e) != NULL ) // { // printf("%d: %d + %d = %d (%f)\n",e->entityId,xRotp,xRota,xRotn,e->xRot); // } @@ -335,7 +335,7 @@ void TrackedEntity::broadcast(std::shared_ptr packet) { dontSend = true; // #ifdef _DEBUG - // std::shared_ptr emp= std::dynamic_pointer_cast (packet); + // std::shared_ptr emp= dynamic_pointer_cast (packet); // if(emp!=NULL) // { // app.DebugPrintf("Not sending this SetEntityMotionPacket to player - it's already been sent to a player on their console\n"); @@ -370,7 +370,7 @@ void TrackedEntity::broadcastAndSend(std::shared_ptr packet) { vector< std::shared_ptr > sentTo; broadcast(packet); - std::shared_ptr sp = std::dynamic_pointer_cast(e); + std::shared_ptr sp = dynamic_pointer_cast(e); if (sp != NULL && sp->connection) { sp->connection->send(packet); @@ -478,7 +478,7 @@ void TrackedEntity::updatePlayer(EntityTracker *tracker, std::shared_ptryd; zap = e->zd; - std::shared_ptr plr = std::dynamic_pointer_cast(e); + std::shared_ptr plr = dynamic_pointer_cast(e); if (plr != NULL) { app.DebugPrintf( "TrackedEntity:: Player '%ls' is now visible to player '%ls', %s.\n", @@ -488,7 +488,7 @@ void TrackedEntity::updatePlayer(EntityTracker *tracker, std::shared_ptrgetEntityData()->isEmpty() && !(std::dynamic_pointer_cast(packet))) + if (!e->getEntityData()->isEmpty() && !(dynamic_pointer_cast(packet))) { sp->connection->send(std::shared_ptr( new SetEntityDataPacket(e->entityId, e->getEntityData(), true))); } @@ -512,18 +512,18 @@ void TrackedEntity::updatePlayer(EntityTracker *tracker, std::shared_ptr(e) != NULL) + if (dynamic_pointer_cast(e) != NULL) { - std::shared_ptr spe = std::dynamic_pointer_cast(e); + std::shared_ptr spe = dynamic_pointer_cast(e); if (spe->isSleeping()) { sp->connection->send( std::shared_ptr( new EntityActionAtPositionPacket(e, EntityActionAtPositionPacket::START_SLEEP, Mth::floor(e->x), Mth::floor(e->y), Mth::floor(e->z)) ) ); } } - if (std::dynamic_pointer_cast(e) != NULL) + if (dynamic_pointer_cast(e) != NULL) { - std::shared_ptr mob = std::dynamic_pointer_cast(e); + std::shared_ptr mob = dynamic_pointer_cast(e); vector *activeEffects = mob->getActiveEffects(); for(AUTO_VAR(it, activeEffects->begin()); it != activeEffects->end(); ++it) { @@ -560,7 +560,7 @@ void TrackedEntity::updatePlayers(EntityTracker *tracker, vectorsize(); i++) { - updatePlayer(tracker, std::dynamic_pointer_cast( players->at(i) ) ); + updatePlayer(tracker, dynamic_pointer_cast( players->at(i) ) ); } } @@ -572,10 +572,10 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() } // 4J-PB - replacing with a switch, rather than tons of ifs - if (std::dynamic_pointer_cast(e) != NULL) + if (dynamic_pointer_cast(e) != NULL) { yHeadRotp = Mth::floor(e->getYHeadRot() * 256 / 360); - return std::shared_ptr( new AddMobPacket(std::dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp, yHeadRotp) ); + return std::shared_ptr( new AddMobPacket(dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp, yHeadRotp) ); } switch(e->GetType()) @@ -588,7 +588,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_SERVERPLAYER: { - std::shared_ptr player = std::dynamic_pointer_cast(e); + std::shared_ptr player = dynamic_pointer_cast(e); PlayerUID xuid = INVALID_XUID; PlayerUID OnlineXuid = INVALID_XUID; if( player != NULL ) @@ -597,12 +597,12 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() OnlineXuid = player->getOnlineXuid(); } // 4J Added yHeadRotp param to fix #102563 - TU12: Content: Gameplay: When one of the Players is idle for a few minutes his head turns 180 degrees. - return std::shared_ptr( new AddPlayerPacket(std::dynamic_pointer_cast(e), xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp, yHeadRotp ) ); + return std::shared_ptr( new AddPlayerPacket(dynamic_pointer_cast(e), xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp, yHeadRotp ) ); } break; case eTYPE_MINECART: { - std::shared_ptr minecart = std::dynamic_pointer_cast(e); + std::shared_ptr minecart = dynamic_pointer_cast(e); if (minecart->type == Minecart::RIDEABLE) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::MINECART_RIDEABLE, yRotp, xRotp, xp, yp, zp) ); if (minecart->type == Minecart::CHEST) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::MINECART_CHEST, yRotp, xRotp, xp, yp, zp) ); if (minecart->type == Minecart::FURNACE) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::MINECART_FURNACE, yRotp, xRotp, xp, yp, zp) ); @@ -616,18 +616,18 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() case eTYPE_ENDERDRAGON: { yHeadRotp = Mth::floor(e->getYHeadRot() * 256 / 360); - return std::shared_ptr( new AddMobPacket(std::dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp, yHeadRotp ) ); + return std::shared_ptr( new AddMobPacket(dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp, yHeadRotp ) ); } break; case eTYPE_FISHINGHOOK: { - std::shared_ptr owner = std::dynamic_pointer_cast(e)->owner; + std::shared_ptr owner = dynamic_pointer_cast(e)->owner; return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::FISH_HOOK, owner != NULL ? owner->entityId : e->entityId, yRotp, xRotp, xp, yp, zp) ); } break; case eTYPE_ARROW: { - std::shared_ptr owner = (std::dynamic_pointer_cast(e))->owner; + std::shared_ptr owner = (dynamic_pointer_cast(e))->owner; return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::ARROW, owner != NULL ? owner->entityId : e->entityId, yRotp, xRotp, xp, yp, zp) ); } break; @@ -638,7 +638,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_THROWNPOTION: { - return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::THROWN_POTION, ((std::dynamic_pointer_cast(e))->getPotionValue()), yRotp, xRotp, xp, yp, zp)); + return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::THROWN_POTION, ((dynamic_pointer_cast(e))->getPotionValue()), yRotp, xRotp, xp, yp, zp)); } break; case eTYPE_THROWNEXPBOTTLE: @@ -658,7 +658,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_SMALL_FIREBALL: { - std::shared_ptr fb = std::dynamic_pointer_cast(e); + std::shared_ptr fb = dynamic_pointer_cast(e); std::shared_ptr aep = nullptr; if (fb->owner != NULL) { @@ -676,7 +676,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_DRAGON_FIREBALL: { - std::shared_ptr fb = std::dynamic_pointer_cast(e); + std::shared_ptr fb = dynamic_pointer_cast(e); std::shared_ptr aep = nullptr; if (fb->owner != NULL) { @@ -694,7 +694,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_FIREBALL: { - std::shared_ptr fb = std::dynamic_pointer_cast(e); + std::shared_ptr fb = dynamic_pointer_cast(e); std::shared_ptr aep = nullptr; if (fb->owner != NULL) { @@ -727,18 +727,18 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_FALLINGTILE: { - std::shared_ptr ft = std::dynamic_pointer_cast(e); + std::shared_ptr ft = dynamic_pointer_cast(e); return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::FALLING, ft->tile | (ft->data << 16), yRotp, xRotp, xp, yp, zp) ); } break; case eTYPE_PAINTING: { - return std::shared_ptr( new AddPaintingPacket(std::dynamic_pointer_cast(e)) ); + return std::shared_ptr( new AddPaintingPacket(dynamic_pointer_cast(e)) ); } break; case eTYPE_ITEM_FRAME: { - std::shared_ptr frame = std::dynamic_pointer_cast(e); + std::shared_ptr frame = dynamic_pointer_cast(e); { int ix= (int)frame->xTile; @@ -756,7 +756,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() break; case eTYPE_EXPERIENCEORB: { - return std::shared_ptr( new AddExperienceOrbPacket(std::dynamic_pointer_cast(e)) ); + return std::shared_ptr( new AddExperienceOrbPacket(dynamic_pointer_cast(e)) ); } break; default: @@ -766,7 +766,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() /* if (e->GetType() == eTYPE_ITEMENTITY) { - std::shared_ptr itemEntity = std::dynamic_pointer_cast(e); + std::shared_ptr itemEntity = dynamic_pointer_cast(e); std::shared_ptr packet = std::shared_ptr( new AddItemEntityPacket(itemEntity, xp, yp, zp) ); itemEntity->x = packet->x / 32.0; itemEntity->y = packet->y / 32.0; @@ -776,7 +776,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() if (e->GetType() == eTYPE_SERVERPLAYER ) { - std::shared_ptr player = std::dynamic_pointer_cast(e); + std::shared_ptr player = dynamic_pointer_cast(e); XUID xuid = INVALID_XUID; XUID OnlineXuid = INVALID_XUID; if( player != NULL ) @@ -784,11 +784,11 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() xuid = player->getXuid(); OnlineXuid = player->getOnlineXuid(); } - return std::shared_ptr( new AddPlayerPacket(std::dynamic_pointer_cast(e), xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp ) ); + return std::shared_ptr( new AddPlayerPacket(dynamic_pointer_cast(e), xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp ) ); } if (e->GetType() == eTYPE_MINECART) { - std::shared_ptr minecart = std::dynamic_pointer_cast(e); + std::shared_ptr minecart = dynamic_pointer_cast(e); if (minecart->type == Minecart::RIDEABLE) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::MINECART_RIDEABLE, yRotp, xRotp, xp, yp, zp) ); if (minecart->type == Minecart::CHEST) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::MINECART_CHEST, yRotp, xRotp, xp, yp, zp) ); if (minecart->type == Minecart::FURNACE) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::MINECART_FURNACE, yRotp, xRotp, xp, yp, zp) ); @@ -797,22 +797,22 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::BOAT, yRotp, xRotp, xp, yp, zp) ); } - if (std::dynamic_pointer_cast(e) != NULL) + if (dynamic_pointer_cast(e) != NULL) { - return std::shared_ptr( new AddMobPacket(std::dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp) ); + return std::shared_ptr( new AddMobPacket(dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp) ); } if (e->GetType() == eTYPE_ENDERDRAGON) { - return std::shared_ptr( new AddMobPacket(std::dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp ) ); + return std::shared_ptr( new AddMobPacket(dynamic_pointer_cast(e), yRotp, xRotp, xp, yp, zp ) ); } if (e->GetType() == eTYPE_FISHINGHOOK) { - std::shared_ptr owner = std::dynamic_pointer_cast(e)->owner; + std::shared_ptr owner = dynamic_pointer_cast(e)->owner; return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::FISH_HOOK, owner != NULL ? owner->entityId : e->entityId, yRotp, xRotp, xp, yp, zp) ); } if (e->GetType() == eTYPE_ARROW) { - std::shared_ptr owner = (std::dynamic_pointer_cast(e))->owner; + std::shared_ptr owner = (dynamic_pointer_cast(e))->owner; return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::ARROW, owner != NULL ? owner->entityId : e->entityId, yRotp, xRotp, xp, yp, zp) ); } if (e->GetType() == eTYPE_SNOWBALL) @@ -821,7 +821,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() } if (e->GetType() == eTYPE_THROWNPOTION) { - return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::THROWN_POTION, ((std::dynamic_pointer_cast(e))->getPotionValue()), yRotp, xRotp, xp, yp, zp)); + return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::THROWN_POTION, ((dynamic_pointer_cast(e))->getPotionValue()), yRotp, xRotp, xp, yp, zp)); } if (e->GetType() == eTYPE_THROWNEXPBOTTLE) { @@ -837,7 +837,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() } if (e->GetType() == eTYPE_SMALL_FIREBALL) { - std::shared_ptr fb = std::dynamic_pointer_cast(e); + std::shared_ptr fb = dynamic_pointer_cast(e); std::shared_ptr aep = NULL; if (fb->owner != NULL) { @@ -854,7 +854,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() } if (e->GetType() == eTYPE_FIREBALL) { - std::shared_ptr fb = std::dynamic_pointer_cast(e); + std::shared_ptr fb = dynamic_pointer_cast(e); std::shared_ptr aep = NULL; if (fb->owner != NULL) { @@ -883,18 +883,18 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() } if (e->GetType() == eTYPE_FALLINGTILE) { - std::shared_ptr ft = std::dynamic_pointer_cast(e); + std::shared_ptr ft = dynamic_pointer_cast(e); if (ft->tile == Tile::sand_Id) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::FALLING_SAND, yRotp, xRotp, xp, yp, zp) ); if (ft->tile == Tile::gravel_Id) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::FALLING_GRAVEL, yRotp, xRotp, xp, yp, zp) ); if (ft->tile == Tile::dragonEgg_Id) return std::shared_ptr( new AddEntityPacket(e, AddEntityPacket::FALLING_EGG, yRotp, xRotp, xp, yp, zp) ); } if (e->GetType() == eTYPE_PAINTING) { - return std::shared_ptr( new AddPaintingPacket(std::dynamic_pointer_cast(e)) ); + return std::shared_ptr( new AddPaintingPacket(dynamic_pointer_cast(e)) ); } if (e->GetType() == eTYPE_ITEM_FRAME) { - std::shared_ptr frame = std::dynamic_pointer_cast(e); + std::shared_ptr frame = dynamic_pointer_cast(e); { int ix= (int)frame->xTile; @@ -911,7 +911,7 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() } if (e->GetType() == eTYPE_EXPERIENCEORB) { - return std::shared_ptr( new AddExperienceOrbPacket(std::dynamic_pointer_cast(e)) ); + return std::shared_ptr( new AddExperienceOrbPacket(dynamic_pointer_cast(e)) ); } assert(false); */ -- cgit v1.2.3