mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-07-04 19:47:05 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
e22425e053
|
|
@ -158,8 +158,6 @@ private:
|
|||
#endif
|
||||
|
||||
int GetRandomishTrack(int iStart,int iEnd);
|
||||
void updateMiniAudio();
|
||||
inline void getGameModeMusicID(Minecraft* pMinecraft, unsigned int i);
|
||||
|
||||
ma_engine m_engine;
|
||||
ma_engine_config m_engineConfig;
|
||||
|
|
@ -203,4 +201,4 @@ private:
|
|||
#ifdef __ORBIS__
|
||||
int32_t m_hBGMAudio;
|
||||
#endif
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ DoorItem::DoorItem(int id, Material *material, const wstring& doorType) : Item(
|
|||
{
|
||||
this->material = material;
|
||||
this->doorType = doorType;
|
||||
maxStackSize = 1;
|
||||
maxStackSize = 64;
|
||||
}
|
||||
|
||||
bool DoorItem::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)
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ void DoorTile::neighborChanged(Level *level, int x, int y, int z, int type)
|
|||
level->removeTile(x, y, z);
|
||||
spawn = true;
|
||||
}
|
||||
if (!level->isSolidBlockingTile(x, y - 1, z))
|
||||
if (!level->isTopSolidBlocking(x, y - 1, z))
|
||||
{
|
||||
level->removeTile(x, y, z);
|
||||
spawn = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue