backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-09 14:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix disenchanting when dropping item from inv

Browse source
This commit is contained in:
sylvessa 2026-04-02 17:45:21 -05:00
parent b97fe888d1
commit f364a5bb07
1 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Minecraft.World/AbstractContainerMenu.cpp
View file

@ -260,15 +260,18 @@ shared_ptr<ItemInstance> AbstractContainerMenu::clicked(int slotIndex, int butto
{ {
int outId = carried->id, outCount = carried->count, outAux = carried->getAuxValue(); int outId = carried->id, outCount = carried->count, outAux = carried->getAuxValue();
if (FourKitBridge::FirePlayerDropItem( if (FourKitBridge::FirePlayerDropItem(
player->entityId, carried->id, carried->count, carried->getAuxValue(), player->entityId, carried->id, carried->count, carried->getAuxValue(),
&outId, &outCount, &outAux)) &outId, &outCount, &outAux))
dropAllowed = false; dropAllowed = false;
else else
{ {
player->drop(std::make_shared<ItemInstance>(outId, outCount, outAux)); carried->id = outId;
inventory->setCarried(nullptr); carried->count = outCount;
dropAllowed = false; carried->setAuxValue(outAux);
} player->drop(carried);
inventory->setCarried(nullptr);
dropAllowed = false;
}
} }
if (dropAllowed) if (dropAllowed)
{ {
@ -290,16 +293,19 @@ shared_ptr<ItemInstance> AbstractContainerMenu::clicked(int slotIndex, int butto
{ {
int outId = carried->id, outCount = 1, outAux = carried->getAuxValue(); int outId = carried->id, outCount = 1, outAux = carried->getAuxValue();
if (FourKitBridge::FirePlayerDropItem( if (FourKitBridge::FirePlayerDropItem(
player->entityId, carried->id, 1, carried->getAuxValue(), player->entityId, carried->id, 1, carried->getAuxValue(),
&outId, &outCount, &outAux)) &outId, &outCount, &outAux))
dropAllowed = false; dropAllowed = false;
else else
{ {
carried->remove(1); shared_ptr<ItemInstance> dropped = carried->remove(1);
if (carried->count == 0) inventory->setCarried(nullptr); if (carried->count == 0) inventory->setCarried(nullptr);
player->drop(std::make_shared<ItemInstance>(outId, outCount, outAux)); dropped->id = outId;
dropAllowed = false; dropped->count = outCount;
} dropped->setAuxValue(outAux);
player->drop(dropped);
dropAllowed = false;
}
} }
if (dropAllowed) if (dropAllowed)
{ {
@ -548,7 +554,10 @@ shared_ptr<ItemInstance> AbstractContainerMenu::clicked(int slotIndex, int butto
{ {
shared_ptr<ItemInstance> item = slot->remove(dropCount); shared_ptr<ItemInstance> item = slot->remove(dropCount);
slot->onTake(player, item); slot->onTake(player, item);
player->drop(std::make_shared<ItemInstance>(outId, outCount, outAux)); item->id = outId;
item->count = outCount;
item->setAuxValue(outAux);
player->drop(item);
dropAllowed = false; dropAllowed = false;
} }
} }