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

26
Minecraft.World/WaterLilyTileItem.cpp
View File

@@ -10,7 +10,7 @@ WaterLilyTileItem::WaterLilyTileItem(int id) : ColoredTileItem(id, false)
{
}
bool WaterLilyTileItem::TestUse(Level *level, shared_ptr<Player> player)
bool WaterLilyTileItem::TestUse(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player)
{
HitResult *hr = getPlayerPOVHitResult(level, player, true);
if (hr == NULL) return false;
@@ -20,13 +20,18 @@ bool WaterLilyTileItem::TestUse(Level *level, shared_ptr<Player> player)
int xt = hr->x;
int yt = hr->y;
int zt = hr->z;
delete hr;
if (!level->mayInteract(player, xt, yt, zt, 0))
{
delete hr;
return false;
}
if (!player->mayBuild(xt, yt, zt)) return false;
if (!player->mayUseItemAt(xt, yt, zt, hr->f, itemInstance))
{
delete hr;
return false;
}
delete hr;
if (level->getMaterial(xt, yt, zt) == Material::water && level->getData(xt, yt, zt) == 0 && level->isEmptyTile(xt, yt + 1, zt))
{
return true;
@@ -49,16 +54,21 @@ shared_ptr<ItemInstance> WaterLilyTileItem::use(shared_ptr<ItemInstance> itemIns
int xt = hr->x;
int yt = hr->y;
int zt = hr->z;
delete hr;
if (!level->mayInteract(player, xt, yt, zt, 0))
{
delete hr;
return itemInstance;
}
if (!player->mayBuild(xt, yt, zt)) return itemInstance;
if (!player->mayUseItemAt(xt, yt, zt, hr->f, itemInstance))
{
delete hr;
return itemInstance;
}
delete hr;
if (level->getMaterial(xt, yt, zt) == Material::water && level->getData(xt, yt, zt) == 0 && level->isEmptyTile(xt, yt + 1, zt))
{
level->setTile(xt, yt + 1, zt, Tile::waterLily->id);
level->setTileAndUpdate(xt, yt + 1, zt, Tile::waterLily->id);
if (!player->abilities.instabuild)
{
itemInstance->count--;