phaneron/MinecraftConsoles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with upstream

Browse source
This commit is contained in:
Soggy_Pancake 2026-03-14 14:51:06 -07:00
commit ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Minecraft.World/PumpkinTile.cpp
View file

@ -13,8 +13,8 @@ const wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack";
PumpkinTile::PumpkinTile(int id, bool lit) : DirectionalTile(id, Material::vegetable, isSolidRender() )
{
iconTop = NULL;
iconFace = NULL;
iconTop = nullptr;
iconFace = nullptr;
setTicking(true);
this->lit = lit;
}
@ -45,7 +45,7 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
shared_ptr<SnowMan> snowMan = shared_ptr<SnowMan>(new SnowMan(level));
shared_ptr<SnowMan> snowMan = std::make_shared<SnowMan>(level);
snowMan->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
level->addEntity(snowMan);
@ -94,7 +94,7 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
level->setTileAndData(x, y - 1, z + 1, 0, 0, Tile::UPDATE_CLIENTS);
}
shared_ptr<VillagerGolem> villagerGolem = shared_ptr<VillagerGolem>(new VillagerGolem(level));
shared_ptr<VillagerGolem> villagerGolem = std::make_shared<VillagerGolem>(level);
villagerGolem->setPlayerCreated(true);
villagerGolem->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
level->addEntity(villagerGolem);