aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/IceTile.cpp
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.World/IceTile.cpp
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* 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 97a43994725008e35fceb984d5549df9c8cea470. * 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>
Diffstat (limited to 'Minecraft.World/IceTile.cpp')
-rw-r--r--Minecraft.World/IceTile.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/IceTile.cpp b/Minecraft.World/IceTile.cpp
index 6ca9cc80..938c098f 100644
--- a/Minecraft.World/IceTile.cpp
+++ b/Minecraft.World/IceTile.cpp
@@ -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);
}
}