pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 13:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix post merge issues

Browse Source
This commit is contained in:
Akkadius
2020-05-23 22:41:59 -05:00
parent 03a4254397
commit 56c4eb280f
8 changed files with 15 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/command.cpp
+1 -1
View File
@@ -7438,7 +7438,7 @@ void command_itemsearch(Client *c, const Seperator *sep)
std::string saylink_commands;
for (auto &amount : amounts) {
saylink_commands += EQEmu::SayLinkEngine::GenerateQuestSaylink(
saylink_commands += EQ::SayLinkEngine::GenerateQuestSaylink(
"#si " + std::to_string(item->ID) + " " + amount,
false,
"[" + amount + "] "
zone/tradeskills.cpp
+2 -2
View File
@@ -311,7 +311,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
}
container = inst;
if (container->GetItem() && container->GetItem()->BagType == EQEmu::item::BagTypeTransformationmold) {
if (container->GetItem() && container->GetItem()->BagType == EQ::item::BagTypeTransformationmold) {
const EQ::ItemInstance *inst = container->GetItem(0);
bool AllowAll = RuleB(Inventory, AllowAnyWeaponTransformation);
if (inst && EQ::ItemInstance::CanTransform(inst->GetItem(), container->GetItem(), AllowAll)) {
@@ -328,7 +328,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
inst->GetAugmentItemID(4),
inst->GetAugmentItemID(5),
inst->IsAttuned(),
EQEmu::invslot::slotCursor,
EQ::invslot::slotCursor,
container->GetItem()->Icon,
atoi(container->GetItem()->IDFile + 2)
);