From 6f67577115161953b4184e92ef949dee8d2e6319 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 27 Nov 2014 22:30:44 -0500 Subject: [PATCH 1/3] Crash fixes --- zone/tradeskills.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index da5114ed2..059a1b909 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -283,7 +283,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob } container = inst; - if (container->GetItem()->BagType == BagTypeTransformationmold) { + if (containe->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(); From cf1370b9e2dfcc71cf8c9091c1f7c781a678bf01 Mon Sep 17 00:00:00 2001 From: Michael Cook Date: Thu, 27 Nov 2014 22:56:40 -0500 Subject: [PATCH 2/3] Spelling matters! --- zone/tradeskills.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 059a1b909..82d84e5cf 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -283,7 +283,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob } container = inst; - if (containe->GetItem() && 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)) { From baa7a1feb948233f63e876a77c13c28ec20d51f6 Mon Sep 17 00:00:00 2001 From: akkadius Date: Thu, 27 Nov 2014 23:24:32 -0600 Subject: [PATCH 3/3] Disabling file check for db_updater.pl temporarily to force update the update script for users. Will leave it this way for a few weeks and the nre-enable it because the latest one supports automatic update checking --- common/database.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index ecf83dc57..558f1d5c0 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -901,21 +901,21 @@ bool Database::CheckDatabaseConversions() { CheckDatabaseConvertCorpseDeblob(); /* Fetch Automatic Database Upgrade Script */ - if (!std::ifstream("db_update.pl")){ + // if (!std::ifstream("db_update.pl")){ std::cout << "Pulling down automatic database upgrade script...\n" << std::endl; #ifdef _WIN32 system("perl -MLWP::UserAgent -e \"require LWP::UserAgent; my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/db_update.pl'); if ($response->is_success){ open(FILE, '> db_update.pl'); print FILE $response->decoded_content; close(FILE); }\""); #else system("wget -O db_update.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/db_update.pl"); #endif - } + // } /* Automatic Database Upgrade Script - Script: db_updater.pl V 1 - the number that world passes to the script will + Script: db_update.pl V 1 - the number that world passes to the script will force the script to check for a newer version to update itself with - db_updater.pl ran_from_world - won't bring up a menu if your database versions match - db_updater.pl - ran standalone will bring up a menu prompt + db_update.pl ran_from_world - won't bring up a menu if your database versions match + db_update.pl - ran standalone will bring up a menu prompt */ /* Check for a new version of this script, the arg passed