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

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.World/WaterLilyTile.cpp
View File

@@ -7,25 +7,25 @@
WaterlilyTile::WaterlilyTile(int id) : Bush(id)
{
this->updateDefaultShape();
this->updateDefaultShape();
}
// 4J Added override
void WaterlilyTile::updateDefaultShape()
{
float ss = 0.5f;
float hh = 0.25f / 16.0f;
this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, hh, 0.5f + ss);
float ss = 0.5f;
float hh = 0.25f / 16.0f;
setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, hh, 0.5f + ss);
}
int WaterlilyTile::getRenderShape()
{
return Tile::SHAPE_LILYPAD;
return Tile::SHAPE_LILYPAD;
}
void WaterlilyTile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, shared_ptr<Entity> source)
{
if (source == NULL || !(dynamic_pointer_cast<Boat>(source)))
if (source == NULL || !source->instanceof(eTYPE_BOAT))
{
Bush::addAABBs(level, x, y, z, box, boxes, source);
}
@@ -67,7 +67,7 @@ bool WaterlilyTile::mayPlaceOn(int tile)
bool WaterlilyTile::canSurvive(Level *level, int x, int y, int z)
{
if (y < 0 || y >= Level::maxBuildHeight) return false;
return level->getMaterial(x, y - 1, z) == Material::water && level->getData(x, y - 1, z) == 0;
return level->getMaterial(x, y - 1, z) == Material::water && level->getData(x, y - 1, z) == 0;
}
bool WaterlilyTile::growTree(Level *level, int x, int y, int z, Random *random)