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

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.World/LeashItem.cpp
View File

@@ -12,7 +12,7 @@ LeashItem::LeashItem(int id) : Item(id)
bool LeashItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
{
int tile = level->getTile(x, y, z);
if (Tile::tiles[tile] != nullptr && Tile::tiles[tile]->getRenderShape() == Tile::SHAPE_FENCE)
if (Tile::tiles[tile] != NULL && Tile::tiles[tile]->getRenderShape() == Tile::SHAPE_FENCE)
{
if (bTestUseOnOnly) return bindPlayerMobsTest(player, level, x,y,z);
@@ -36,14 +36,14 @@ bool LeashItem::bindPlayerMobs(shared_ptr<Player> player, Level *level, int x, i
bool foundMobs = false;
double range = 7;
vector<shared_ptr<Entity> > *mobs = level->getEntitiesOfClass(typeid(Mob), AABB::newTemp(x - range, y - range, z - range, x + range, y + range, z + range));
if (mobs != nullptr)
if (mobs != NULL)
{
for(auto& it : *mobs)
{
shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(it);
if (mob->isLeashed() && mob->getLeashHolder() == player)
{
if (activeKnot == nullptr)
if (activeKnot == NULL)
{
activeKnot = LeashFenceKnotEntity::createAndAddKnot(level, x, y, z);
}
@@ -62,7 +62,7 @@ bool LeashItem::bindPlayerMobsTest(shared_ptr<Player> player, Level *level, int
double range = 7;
vector<shared_ptr<Entity> > *mobs = level->getEntitiesOfClass(typeid(Mob), AABB::newTemp(x - range, y - range, z - range, x + range, y + range, z + range));
if (mobs != nullptr)
if (mobs != NULL)
{
for(auto& it : *mobs)
{