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

19
Minecraft.World/TrapDoorTile.cpp
View File

@@ -72,7 +72,14 @@ void TrapDoorTile::setShape(int data)
{
float r = 3 / 16.0f;
Tile::setShape(0, 0, 0, 1, r, 1);
if ((data & TOP_MASK) != 0)
{
setShape(0, 1 - r, 0, 1, 1, 1);
}
else
{
setShape(0, 0, 0, 1, r, 1);
}
if (isOpen(data))
{
if ((data & 3) == 0) setShape(0, 0, 1 - r, 1, 1, 1);
@@ -85,7 +92,7 @@ void TrapDoorTile::setShape(int data)
void TrapDoorTile::attack(Level *level, int x, int y, int z, shared_ptr<Player> player)
{
use(level, x, y, z, player, 0, 0, 0, 0);
//use(level, x, y, z, player, 0, 0, 0, 0);
}
// 4J-PB - Adding a TestUse for tooltip display
@@ -106,7 +113,7 @@ bool TrapDoorTile::use(Level *level, int x, int y, int z, shared_ptr<Player> pla
}
int dir = level->getData(x, y, z);
level->setData(x, y, z, dir ^ 4);
level->setData(x, y, z, dir ^ 4, Tile::UPDATE_CLIENTS);
level->levelEvent(player, LevelEvent::SOUND_OPEN_DOOR, x, y, z, 0);
return true;
@@ -120,7 +127,7 @@ void TrapDoorTile::setOpen(Level *level, int x, int y, int z, bool shouldOpen)
bool wasOpen = (dir & 4) > 0;
if (wasOpen == shouldOpen) return;
level->setData(x, y, z, dir ^ 4);
level->setData(x, y, z, dir ^ 4, Tile::UPDATE_CLIENTS);
level->levelEvent(nullptr, LevelEvent::SOUND_OPEN_DOOR, x, y, z, 0);
}
@@ -140,7 +147,7 @@ void TrapDoorTile::neighborChanged(Level *level, int x, int y, int z, int type)
if (!attachesTo(level->getTile(xt, y, zt)))
{
level->setTile(x, y, z, 0);
level->removeTile(x, y, z);
spawnResources(level, x, y, z, data, 0);
}
@@ -205,5 +212,5 @@ bool TrapDoorTile::attachesTo(int id)
}
Tile *tile = Tile::tiles[id];
return tile != NULL && (tile->material->isSolidBlocking() && tile->isCubeShaped()) || tile == Tile::lightGem || (dynamic_cast<HalfSlabTile *>(tile) != NULL) || (dynamic_cast<StairTile *>(tile) != NULL);
return tile != NULL && (tile->material->isSolidBlocking() && tile->isCubeShaped()) || tile == Tile::glowstone || (dynamic_cast<HalfSlabTile *>(tile) != NULL) || (dynamic_cast<StairTile *>(tile) != NULL);
}