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

@@ -42,7 +42,7 @@ bool FlowerPotTile::use(Level *level, int x, int y, int z, shared_ptr<Player> pl
if (type > 0)
{
level->setData(x, y, z, type);
level->setData(x, y, z, type, Tile::UPDATE_CLIENTS);
if (!player->abilities.instabuild)
{
@@ -102,7 +102,7 @@ void FlowerPotTile::neighborChanged(Level *level, int x, int y, int z, int type)
{
spawnResources(level, x, y, z, level->getData(x, y, z), 0);
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
}
}
@@ -133,9 +133,9 @@ shared_ptr<ItemInstance> FlowerPotTile::getItemFromType(int type)
case TYPE_CACTUS:
return shared_ptr<ItemInstance>( new ItemInstance(Tile::cactus) );
case TYPE_MUSHROOM_BROWN:
return shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom1) );
return shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom_brown) );
case TYPE_MUSHROOM_RED:
return shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom2) );
return shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom_red) );
case TYPE_DEAD_BUSH:
return shared_ptr<ItemInstance>( new ItemInstance(Tile::deadBush) );
case TYPE_SAPLING_DEFAULT:
@@ -160,8 +160,8 @@ int FlowerPotTile::getTypeFromItem(shared_ptr<ItemInstance> item)
if (id == Tile::rose_Id) return TYPE_FLOWER_RED;
if (id == Tile::flower_Id) return TYPE_FLOWER_YELLOW;
if (id == Tile::cactus_Id) return TYPE_CACTUS;
if (id == Tile::mushroom1_Id) return TYPE_MUSHROOM_BROWN;
if (id == Tile::mushroom2_Id) return TYPE_MUSHROOM_RED;
if (id == Tile::mushroom_brown_Id) return TYPE_MUSHROOM_BROWN;
if (id == Tile::mushroom_red_Id) return TYPE_MUSHROOM_RED;
if (id == Tile::deadBush_Id) return TYPE_DEAD_BUSH;
if (id == Tile::sapling_Id)