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/ResultSlot.cpp
View File

@@ -66,21 +66,17 @@ void ResultSlot::onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carr
if (item->getItem()->hasCraftingRemainingItem())
{
// (TheApathetic)
shared_ptr<ItemInstance> craftResult = shared_ptr<ItemInstance>(new ItemInstance(item->getItem()->getCraftingRemainingItem()));
/*
* Try to place this in the player's inventory (See we.java
* for new method)
* Try to place this in the player's inventory (See we.java for new method)
*/
if (item->getItem()->shouldMoveCraftingResultToInventory(item) && this->player->inventory->add(craftResult))
if (item->getItem()->shouldMoveCraftingResultToInventory(item) && player->inventory->add(craftResult))
{
continue;
}
// If this slot is now empty, place it there (current
// behavior)
// If this slot is now empty, place it there (current behavior)
if (craftSlots->getItem(i) == NULL)
{
craftSlots->setItem(i, craftResult);
@@ -88,7 +84,7 @@ void ResultSlot::onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carr
else
{
// Finally, if nothing else, just drop the item
this->player->drop(craftResult);
player->drop(craftResult);
}
}