phaneron/MinecraftConsoles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with upstream

Browse source
This commit is contained in:
Soggy_Pancake 2026-03-14 14:51:06 -07:00
commit ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Minecraft.World/DropperTile.cpp
View file

@ -27,14 +27,14 @@ DispenseItemBehavior *DropperTile::getDispenseMethod(shared_ptr<ItemInstance> it
shared_ptr<TileEntity> DropperTile::newTileEntity(Level *level)
{
return shared_ptr<DropperTileEntity>( new DropperTileEntity() );
return std::make_shared<DropperTileEntity>();
}
void DropperTile::dispenseFrom(Level *level, int x, int y, int z)
{
BlockSourceImpl source(level, x, y, z);
shared_ptr<DispenserTileEntity> trap = dynamic_pointer_cast<DispenserTileEntity>( source.getEntity() );
if (trap == NULL) return;
if (trap == nullptr) return;
int slot = trap->getRandomSlot();
if (slot < 0)
@ -48,11 +48,11 @@ void DropperTile::dispenseFrom(Level *level, int x, int y, int z)
shared_ptr<Container> into = HopperTileEntity::getContainerAt(level, x + Facing::STEP_X[face], y + Facing::STEP_Y[face], z + Facing::STEP_Z[face]);
shared_ptr<ItemInstance> remaining = nullptr;
if (into != NULL)
if (into != nullptr)
{
remaining = HopperTileEntity::addItem(into.get(), item->copy()->remove(1), Facing::OPPOSITE_FACING[face]);
if (remaining == NULL)
if (remaining == nullptr)
{
remaining = item->copy();
if (--remaining->count == 0) remaining = nullptr;
@ -66,7 +66,7 @@ void DropperTile::dispenseFrom(Level *level, int x, int y, int z)
else
{
remaining = DISPENSE_BEHAVIOUR->dispense(&source, item);
if (remaining != NULL && remaining->count == 0) remaining = nullptr;
if (remaining != nullptr && remaining->count == 0) remaining = nullptr;
}
trap->setItem(slot, remaining);