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

10
Minecraft.World/FireChargeItem.cpp
View File

@@ -13,7 +13,7 @@ FireChargeItem::FireChargeItem(int id) : Item(id)
m_dragonFireballIcon = NULL;
}
bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
bool FireChargeItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
{
if (level->isClientSide)
{
@@ -27,7 +27,7 @@ bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Pla
if (face == 4) x--;
if (face == 5) x++;
if (!player->mayBuild(x, y, z))
if (!player->mayUseItemAt(x, y, z, face, instance))
{
return false;
}
@@ -42,13 +42,13 @@ bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Pla
if (targetType == 0)
{
level->playSound( x + 0.5, y + 0.5, z + 0.5,eSoundType_FIRE_IGNITE, 1, random->nextFloat() * 0.4f + 0.8f);
level->setTile(x, y, z, Tile::fire_Id);
level->playSound( x + 0.5, y + 0.5, z + 0.5,eSoundType_FIRE_NEWIGNITE, 1, random->nextFloat() * 0.4f + 0.8f);
level->setTileAndUpdate(x, y, z, Tile::fire_Id);
}
if (!player->abilities.instabuild)
{
itemInstance->count--;
instance->count--;
}
return true;
}