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

24
Minecraft.World/ShearsItem.cpp
View File

@@ -9,14 +9,14 @@ ShearsItem::ShearsItem(int itemId) : Item(itemId)
setMaxDamage(238);
}
bool ShearsItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner)
bool ShearsItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<LivingEntity> owner)
{
if (tile == Tile::leaves_Id || tile == Tile::web_Id || tile == Tile::tallgrass_Id || tile == Tile::vine_Id || tile == Tile::tripWire_Id)
if (tile == Tile::leaves_Id || tile == Tile::web_Id || tile == Tile::tallgrass_Id || tile == Tile::vine_Id || tile == Tile::tripWire_Id)
{
itemInstance->hurt(1, owner);
itemInstance->hurtAndBreak(1, owner);
return true;
}
return Item::mineBlock(itemInstance, level, tile, x, y, z, owner);
}
return Item::mineBlock(itemInstance, level, tile, x, y, z, owner);
}
bool ShearsItem::canDestroySpecial(Tile *tile)
@@ -26,13 +26,13 @@ bool ShearsItem::canDestroySpecial(Tile *tile)
float ShearsItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
{
if (tile->id == Tile::web_Id || tile->id == Tile::leaves_Id)
if (tile->id == Tile::web_Id || tile->id == Tile::leaves_Id)
{
return 15;
}
if (tile->id == Tile::cloth_Id)
return 15;
}
if (tile->id == Tile::wool_Id)
{
return 5;
}
return Item::getDestroySpeed(itemInstance, tile);
return 5;
}
return Item::getDestroySpeed(itemInstance, tile);
}