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

6
Minecraft.World/TripWireTile.cpp
View File

@@ -20,7 +20,7 @@ int TripWireTile::getTickDelay(Level *level)
AABB *TripWireTile::getAABB(Level *level, int x, int y, int z)
{
return NULL;
return nullptr;
}
bool TripWireTile::blocksLight()
@@ -106,7 +106,7 @@ void TripWireTile::playerWillDestroy(Level *level, int x, int y, int z, int data
{
if (level->isClientSide) return;
if (player->getSelectedItem() != NULL && player->getSelectedItem()->id == Item::shears_Id)
if (player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::shears_Id)
{
level->setData(x, y, z, data | MASK_DISARMED, Tile::UPDATE_NONE);
}
@@ -165,7 +165,7 @@ void TripWireTile::checkPressed(Level *level, int x, int y, int z)
bool wasPressed = (data & MASK_POWERED) == MASK_POWERED;
bool shouldBePressed = false;
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
if (!entities->empty())
{