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

Merge git://github.com/EQEmu/Server into Development

Browse Source
This commit is contained in:
KayenEQ
2014-11-28 01:07:55 -05:00
parent 28ad768c0a baa7a1feb9
commit 94a0cb3522
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/tradeskills.cpp
+2 -2
View File
@@ -283,7 +283,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
}
container = inst;
if (container->GetItem()->BagType == BagTypeTransformationmold) {
if (container->GetItem() && container->GetItem()->BagType == BagTypeTransformationmold) {
const ItemInst* inst = container->GetItem(0);
bool AllowAll = RuleB(Inventory, AllowAnyWeaponTransformation);
if (inst && ItemInst::CanTransform(inst->GetItem(), container->GetItem(), AllowAll)) {
@@ -304,7 +304,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
return;
}
if (container->GetItem()->BagType == BagTypeDetransformationmold) {
if (container->GetItem() && container->GetItem()->BagType == BagTypeDetransformationmold) {
const ItemInst* inst = container->GetItem(0);
if (inst && inst->GetOrnamentationIcon() && inst->GetOrnamentationIcon()) {
const Item_Struct* new_weapon = inst->GetItem();