Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.World/HangingEntity.cpp
View File

@@ -35,16 +35,16 @@ HangingEntity::HangingEntity(Level *level, int xTile, int yTile, int zTile, int
void HangingEntity::setDir(int dir)
{
this->dir = dir;
yRotO = yRot = (float)(dir * 90);
yRotO = yRot = static_cast<float>(dir * 90);
float w = (float)getWidth();
float h = (float)getHeight();
float d = (float)getWidth();
float w = static_cast<float>(getWidth());
float h = static_cast<float>(getHeight());
float d = static_cast<float>(getWidth());
if (dir == Direction::NORTH || dir == Direction::SOUTH)
{
d = 0.5f;
yRot = yRotO = (float)(Direction::DIRECTION_OPPOSITE[dir] * 90);
yRot = yRotO = static_cast<float>(Direction::DIRECTION_OPPOSITE[dir] * 90);
}
else
{
@@ -150,7 +150,7 @@ bool HangingEntity::survives()
vector<shared_ptr<Entity> > *entities = level->getEntities(shared_from_this(), bb);
if (entities != NULL && entities->size() > 0)
if (entities != nullptr && entities->size() > 0)
{
for (auto& e : *entities)
{
@@ -184,11 +184,11 @@ bool HangingEntity::hurt(DamageSource *source, float damage)
if (isInvulnerable()) return false;
if (!removed && !level->isClientSide)
{
if (dynamic_cast<EntityDamageSource *>(source) != NULL)
if (dynamic_cast<EntityDamageSource *>(source) != nullptr)
{
shared_ptr<Entity> sourceEntity = source->getDirectEntity();
if ( (sourceEntity != NULL) && sourceEntity->instanceof(eTYPE_PLAYER) && !dynamic_pointer_cast<Player>(sourceEntity)->isAllowedToHurtEntity(shared_from_this()) )
if ( (sourceEntity != nullptr) && sourceEntity->instanceof(eTYPE_PLAYER) && !dynamic_pointer_cast<Player>(sourceEntity)->isAllowedToHurtEntity(shared_from_this()) )
{
return false;
}
@@ -199,12 +199,12 @@ bool HangingEntity::hurt(DamageSource *source, float damage)
shared_ptr<Player> player = nullptr;
shared_ptr<Entity> e = source->getEntity();
if ( (e!=NULL) && e->instanceof(eTYPE_PLAYER) ) // check if it's serverplayer or player
if ( (e!=nullptr) && e->instanceof(eTYPE_PLAYER) ) // check if it's serverplayer or player
{
player = dynamic_pointer_cast<Player>( e );
}
if (player != NULL && player->abilities.instabuild)
if (player != nullptr && player->abilities.instabuild)
{
return true;
}
@@ -235,7 +235,7 @@ void HangingEntity::push(double xa, double ya, double za)
void HangingEntity::addAdditonalSaveData(CompoundTag *tag)
{
tag->putByte(L"Direction", (byte) dir);
tag->putByte(L"Direction", static_cast<byte>(dir));
tag->putInt(L"TileX", xTile);
tag->putInt(L"TileY", yTile);
tag->putInt(L"TileZ", zTile);