backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-07-07 01:17:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

armorstand fix

Browse source
This commit is contained in:
Lord_Cambion 2026-03-27 18:29:01 +01:00
parent 631a7822b9
commit 8111c594f1
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Minecraft.World/ArmorStand.cpp
View file

@ -106,6 +106,7 @@ bool ArmorStand::interact(shared_ptr<Player> player)
float lookYDiff = -tan(pitchRad) * distHoriz;
float hitY = (player->y + 1.62f + lookYDiff) - this->y;
int targetSlot = SLOT_WEAPON;
if (hitY >= 0.1f && hitY < 0.55f) {
targetSlot = SLOT_BOOTS;
@ -118,35 +119,39 @@ bool ArmorStand::interact(shared_ptr<Player> player)
}
shared_ptr<ItemInstance> playerItem = player->getCarriedItem();
int slotToInteract = (playerItem != nullptr) ? getEquipmentSlotForItem(playerItem) : targetSlot;
if (isSlotDisabled(slotToInteract)) return false;
shared_ptr<ItemInstance> standItem = getItemInSlot(slotToInteract);
if (playerItem != nullptr) {
int correctSlot = getEquipmentSlotForItem(playerItem);
if (isSlotDisabled(correctSlot)) return false;
shared_ptr<ItemInstance> toPlace = ItemInstance::clone(playerItem);
toPlace->count = 1;
setEquippedSlot(slotToInteract, toPlace);
shared_ptr<ItemInstance> standItem = getItemInSlot(correctSlot);
shared_ptr<ItemInstance> toPlace = ItemInstance::clone(playerItem);
toPlace->count = 1;
setEquippedSlot(correctSlot, toPlace);
if (standItem != nullptr) {
if (playerItem->count > 1) {
playerItem->remove(1);
if (!player->inventory->add(standItem)) spawnAtLocation(standItem, 0.0f);
if (standItem != nullptr) {
if (playerItem->count > 1) {
playerItem->remove(1);
if (!player->inventory->add(standItem)) spawnAtLocation(standItem, 0.0f);
} else {
player->inventory->setItem(player->inventory->selected, standItem);
}
} else {
player->inventory->setItem(player->inventory->selected, standItem);
playerItem->remove(1);
}
} else {
playerItem->remove(1);
}
else if (standItem != nullptr) {
player->inventory->setItem(player->inventory->selected, standItem);
setEquippedSlot(slotToInteract, nullptr);
}
return true;
}
}
bool ArmorStand::hurt(DamageSource *source, float damage)
{
if (isInvulnerable() || level->isClientSide || removed || isMarker()) return false;