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

12
Minecraft.World/IceTile.cpp
View File

@@ -27,7 +27,7 @@ void IceTile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int
player->awardStat(GenericStats::blocksMined(id), GenericStats::param_blocksMined(id,data,1) );
player->causeFoodExhaustion(FoodConstants::EXHAUSTION_MINE);
if (isSilkTouchable() && EnchantmentHelper::hasSilkTouch(player->inventory))
if (isSilkTouchable() && EnchantmentHelper::hasSilkTouch(player))
{
shared_ptr<ItemInstance> item = getSilkTouchItemInstance(data);
if (item != NULL)
@@ -39,16 +39,16 @@ void IceTile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int
{
if (level->dimension->ultraWarm)
{
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
return;
}
int playerBonusLevel = EnchantmentHelper::getDiggingLootBonus(player->inventory);
int playerBonusLevel = EnchantmentHelper::getDiggingLootBonus(player);
spawnResources(level, x, y, z, data, playerBonusLevel);
Material *below = level->getMaterial(x, y - 1, z);
if (below->blocksMotion() || below->isLiquid())
{
level->setTile(x, y, z, Tile::water_Id);
level->setTileAndUpdate(x, y, z, Tile::water_Id);
}
}
}
@@ -64,11 +64,11 @@ void IceTile::tick(Level *level, int x, int y, int z, Random *random)
{
if (level->dimension->ultraWarm)
{
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
return;
}
this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
level->setTile(x, y, z, Tile::calmWater_Id);
level->setTileAndUpdate(x, y, z, Tile::calmWater_Id);
}
}