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

18
Minecraft.World/Bush.cpp
View File

@@ -5,13 +5,13 @@
void Bush::_init()
{
setTicking(true);
updateDefaultShape();
setTicking(true);
updateDefaultShape();
}
Bush::Bush(int id, Material *material) : Tile(id, material, isSolidRender())
{
_init();
_init();
}
Bush::Bush(int id) : Tile(id, Material::plant, isSolidRender())
@@ -22,8 +22,8 @@ Bush::Bush(int id) : Tile(id, Material::plant, isSolidRender())
// 4J Added override
void Bush::updateDefaultShape()
{
float ss = 0.2f;
this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 3, 0.5f + ss);
float ss = 0.2f;
setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 3, 0.5f + ss);
}
bool Bush::mayPlace(Level *level, int x, int y, int z)
@@ -49,11 +49,11 @@ void Bush::tick(Level *level, int x, int y, int z, Random *random)
void Bush::checkAlive(Level *level, int x, int y, int z)
{
if (!canSurvive(level, x, y, z))
if (!canSurvive(level, x, y, z))
{
this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
level->setTile(x, y, z, 0);
}
this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
level->setTileAndData(x, y, z, 0, 0, UPDATE_CLIENTS);
}
}
bool Bush::canSurvive(Level *level, int x, int y, int z)