From 2c441808f13a1005d5107e64de55cebe2c5aa6db Mon Sep 17 00:00:00 2001 From: Geodar Date: Sat, 8 Sep 2012 08:02:00 +0200 Subject: Core/Scripts: Fix Typo in 7121f015ed6561a4bc12cf08d8f9286b113e66ad --- src/server/scripts/Spells/spell_warlock.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index a48661d4aed..0def62b7d3a 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -679,38 +679,38 @@ class spell_warl_health_funnel : public SpellScriptLoader { public: spell_warl_health_funnel() : SpellScriptLoader("spell_warl_health_funnel") { } - + class spell_warl_health_funnel_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_health_funnel_AuraScript) - + PrepareAuraScript(spell_warl_health_funnel_AuraScript); + void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); if (!caster) return; - + Unit* target = GetTarget(); if (caster->HasAura(WARLOCK_IMPROVED_HEALTH_FUNNEL_R2)) target->CastSpell(target, WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2, true); else if (caster->HasAura(WARLOCK_IMPROVED_HEALTH_FUNNEL_R1)) target->CastSpell(target, WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1, true); } - + void RemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); target->RemoveAurasDueToSpell(WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1); target->RemoveAurasDueToSpell(WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2); } - + void Register() { OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } }; - + AuraScript* GetAuraScript() const { return new spell_warl_health_funnel_AuraScript(); -- cgit v1.2.3 From 9c54cf3312fff7fe08782566307ced6ff987d851 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 8 Sep 2012 13:24:42 +0200 Subject: Core: Fix warnings --- .../CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index ea51f07dbe3..87e7801566e 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -330,7 +330,7 @@ public: me->DespawnOrUnsummon(); } - void UpdateAI(uint32 const diff) {} + void UpdateAI(uint32 const /*diff*/) {} }; }; @@ -441,7 +441,7 @@ public: me->DespawnOrUnsummon(); } - void UpdateAI(uint32 const diff) {} + void UpdateAI(uint32 const /*diff*/) {} }; }; -- cgit v1.2.3 From b8343391c2db98972d67ebc7d86871c871e29f9f Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 8 Sep 2012 07:41:35 -0500 Subject: Core/Scripts: Muglash should walk instead of running. --- src/server/scripts/Kalimdor/ashenvale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 248932ecbb6..6a9dd77433a 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -447,7 +447,7 @@ class npc_muglash : public CreatureScript DoScriptText(SAY_MUG_START1, creature); creature->setFaction(113); - pEscortAI->Start(true, true, player->GetGUID()); + pEscortAI->Start(true, false, player->GetGUID()); } } return true; -- cgit v1.2.3 From be181b2ccdb1e9d0cce1972008e4e89359593c98 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 8 Sep 2012 07:46:47 -0500 Subject: Core/Spells: Use the UNIT_FIELD_CHANNEL_OBJECT field instead of Spell::m_targets to select the channel targets of a triggered spell. Closes #7246 --- src/server/game/Spells/Spell.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index eee6a1f02d4..4d095e0f951 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -916,7 +916,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffIndex effIndex, SpellImplicitTa { case TARGET_UNIT_CHANNEL_TARGET: { - WorldObject* target = ObjectAccessor::GetUnit(*m_caster, channeledSpell->m_targets.GetUnitTargetGUID()); + WorldObject* target = ObjectAccessor::GetUnit(*m_caster, m_originalCaster->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT)); CallScriptObjectTargetSelectHandlers(target, effIndex); // unit target may be no longer avalible - teleported out of map for example if (target && target->ToUnit()) @@ -928,7 +928,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffIndex effIndex, SpellImplicitTa case TARGET_DEST_CHANNEL_TARGET: if (channeledSpell->m_targets.HasDst()) m_targets.SetDst(channeledSpell->m_targets); - else if (WorldObject* target = ObjectAccessor::GetWorldObject(*m_caster, channeledSpell->m_targets.GetObjectTargetGUID())) + else if (WorldObject* target = ObjectAccessor::GetWorldObject(*m_caster, m_originalCaster->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))) { CallScriptObjectTargetSelectHandlers(target, effIndex); if (target) -- cgit v1.2.3 From f9fdf03ec2ffe9d5af1ca2d6f45b29ef8f8de56b Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 8 Sep 2012 07:59:21 -0500 Subject: Core/Spells: Corrected Glyph of Blessing of Might and Glyph of Blessing of Wisdom. They should not affect Greater Blessing of Might and Greater Blessing of Wisdom. --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 618ea30bce6..1c43c8edd62 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13235,13 +13235,13 @@ int32 Unit::ModSpellDuration(SpellInfo const* spellProto, Unit const* target, in } break; case SPELLFAMILY_PALADIN: - if (spellProto->SpellFamilyFlags[0] & 0x00000002) + if (spellProto->SpellFamilyFlags[0] & 0x00000002 && spellProto->SpellIconID == 298) { // Glyph of Blessing of Might if (AuraEffect* aurEff = GetAuraEffect(57958, 0)) duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS; } - else if (spellProto->SpellFamilyFlags[0] & 0x00010000) + else if (spellProto->SpellFamilyFlags[0] & 0x00010000 && spellProto->SpellIconID == 306) { // Glyph of Blessing of Wisdom if (AuraEffect* aurEff = GetAuraEffect(57979, 0)) -- cgit v1.2.3 From 9a962f86c9fdac18f4b2041caf032eb61cf7bb90 Mon Sep 17 00:00:00 2001 From: Kiddie Date: Sat, 8 Sep 2012 17:29:27 +0100 Subject: Core\Characters: Consecutive letters validation for CheckPlayerName Closes #7694 --- src/server/game/Globals/ObjectMgr.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3d58d5f4ce9..ecafc879b65 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7301,6 +7301,11 @@ uint8 ObjectMgr::CheckPlayerName(const std::string& name, bool create) if (!isValidString(wname, strictMask, false, create)) return CHAR_NAME_MIXED_LANGUAGES; + wstrToLower(wname); + for (size_t i = 2; i < wname.size(); ++i) + if (wname[i] == wname[i-1] && wname[i] == wname[i-2]) + return CHAR_NAME_THREE_CONSECUTIVE; + return CHAR_NAME_SUCCESS; } -- cgit v1.2.3 From cfd11b490be12fa092d0685a702c540e63c5650e Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 8 Sep 2012 12:18:50 -0500 Subject: Core/Items: Fixed items with ITEM_MOD_BLOCK_VALUE ( Increases the block value of your shield by X ) Closes #716 --- src/server/game/Entities/Player/Player.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d8b20454321..55d90ba1c18 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7913,6 +7913,9 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE, -val, apply); m_spellPenetrationItemMod += apply ? val : -val; break; + case ITEM_MOD_BLOCK_VALUE: + HandleBaseModValue(SHIELD_BLOCK_VALUE, FLAT_MOD, float(val), apply); + break; // deprecated item mods case ITEM_MOD_SPELL_HEALING_DONE: case ITEM_MOD_SPELL_DAMAGE_DONE: -- cgit v1.2.3 From d33259e84e6dd21f01939e67d63f4dd1f6b05f3a Mon Sep 17 00:00:00 2001 From: Shocker Date: Sat, 8 Sep 2012 20:29:03 +0300 Subject: Core/Spells: Remove incorrect usage of SPELL_ATTR0_NEGATIVE_1 in CanDispelAura (which is used in SPELL_AURA_SCHOOL_IMMUNITY handling) Closes #5940 --- src/server/game/Spells/SpellInfo.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index d37ff1465bd..1141517bfe8 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1127,10 +1127,6 @@ bool SpellInfo::CanPierceImmuneAura(SpellInfo const* aura) const bool SpellInfo::CanDispelAura(SpellInfo const* aura) const { - // These auras (like ressurection sickness) can't be dispelled - if (aura->Attributes & SPELL_ATTR0_NEGATIVE_1) - return false; - // These spells (like Mass Dispel) can dispell all auras if (Attributes & SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY) return true; -- cgit v1.2.3 From 7dbc20626e06d6f1d42bf4983f7f21c76b1eb787 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 8 Sep 2012 15:24:59 -0500 Subject: Core/Entities: Fixed GameObject::FindNearestX for objects with the same coordinates. closes #4581 --- src/server/game/Entities/GameObject/GameObject.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 808cbd9a5e4..c28ff21bfa5 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1707,6 +1707,11 @@ bool GameObject::IsInRange(float x, float y, float z, float radius) const float dy = y - GetPositionY(); float dz = z - GetPositionZ(); float dist = sqrt(dx*dx + dy*dy); + //! Check if the distance between the 2 objects is 0, can happen if both objects are on the same position. + //! The code below this check wont crash if dist is 0 because 0/0 in float operations is valid, and returns infinite + if (G3D::fuzzyEq(dist, 0.0f)) + return true; + float sinB = dx / dist; float cosB = dy / dist; dx = dist * (cosA * cosB + sinA * sinB); -- cgit v1.2.3 From b30aeb8d511861ed4674b5076ca11bce4cead01f Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 8 Sep 2012 23:15:29 +0100 Subject: Core/Objects: Method to get nearest GO of type X, FindNearestGameObjectOfType Thanks Subv for the idea --- src/server/game/Entities/Object/Object.cpp | 9 +++++++++ src/server/game/Entities/Object/Object.h | 1 + src/server/game/Grids/Notifiers/GridNotifiers.h | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index fe5d32b9b95..cbdae9de0bf 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2537,6 +2537,15 @@ GameObject* WorldObject::FindNearestGameObject(uint32 entry, float range) const return go; } +GameObject* WorldObject::FindNearestGameObjectOfType(GameobjectTypes type, float range) const +{ + GameObject* go = NULL; + Trinity::NearestGameObjectTypeInObjectRangeCheck checker(*this, type, range); + Trinity::GameObjectLastSearcher searcher(this, go, checker); + VisitNearbyGridObject(range, searcher); + return go; +} + void WorldObject::GetGameObjectListWithEntryInGrid(std::list& gameobjectList, uint32 entry, float maxSearchRange) const { CellCoord pair(Trinity::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index ab9ea2daea9..410903f6619 100755 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -799,6 +799,7 @@ class WorldObject : public Object, public WorldLocation Creature* FindNearestCreature(uint32 entry, float range, bool alive = true) const; GameObject* FindNearestGameObject(uint32 entry, float range) const; + GameObject* FindNearestGameObjectOfType(GameobjectTypes type, float range) const; void GetGameObjectListWithEntryInGrid(std::list& lList, uint32 uiEntry, float fMaxSearchRange) const; void GetCreatureListWithEntryInGrid(std::list& lList, uint32 uiEntry, float fMaxSearchRange) const; diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 072db578220..db4dc819557 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -694,6 +694,30 @@ namespace Trinity NearestGameObjectEntryInObjectRangeCheck(NearestGameObjectEntryInObjectRangeCheck const&); }; + // Success at unit in range, range update for next check (this can be use with GameobjectLastSearcher to find nearest GO with a certain type) + class NearestGameObjectTypeInObjectRangeCheck + { + public: + NearestGameObjectTypeInObjectRangeCheck(WorldObject const& obj, GameobjectTypes type, float range) : i_obj(obj), i_type(type), i_range(range) {} + bool operator()(GameObject* go) + { + if (go->GetGoType() == i_type && i_obj.IsWithinDistInMap(go, i_range)) + { + i_range = i_obj.GetDistance(go); // use found GO range as new range limit for next check + return true; + } + return false; + } + float GetLastRange() const { return i_range; } + private: + WorldObject const& i_obj; + GameobjectTypes i_type; + float i_range; + + // prevent clone this object + NearestGameObjectTypeInObjectRangeCheck(NearestGameObjectTypeInObjectRangeCheck const&); + }; + class GameObjectWithDbGUIDCheck { public: -- cgit v1.2.3 From e0a3643913dc24f1962b76521e2b6da5c45e4ea6 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 8 Sep 2012 23:16:14 +0100 Subject: Core/Characters: Add validation checks to barbershop use (prevents exploits) Thanks Kiddie Closes #7702 --- src/server/game/Handlers/CharacterHandler.cpp | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index c294dd9b772..5080d668702 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1308,12 +1308,29 @@ void WorldSession::HandleAlterAppearance(WorldPacket & recv_data) if (bs_skinColor && (bs_skinColor->type != 3 || bs_skinColor->race != _player->getRace() || bs_skinColor->gender != _player->getGender())) return; - uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id, bs_skinColor); + GameObject* go = _player->FindNearestGameObjectOfType(GAMEOBJECT_TYPE_BARBER_CHAIR, 5.0f); + if (!go) + { + WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4); + data << uint32(2); + SendPacket(&data); + return; + } + + if (_player->getStandState() != UNIT_STAND_STATE_SIT_LOW_CHAIR + go->GetGOInfo()->barberChair.chairheight) + { + WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4); + data << uint32(2); + SendPacket(&data); + return; + } + + uint32 cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id, bs_skinColor); // 0 - ok // 1, 3 - not enough money // 2 - you have to seat on barber chair - if (!_player->HasEnoughMoney(Cost)) + if (!_player->HasEnoughMoney(cost)) { WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4); data << uint32(1); // no money @@ -1327,8 +1344,8 @@ void WorldSession::HandleAlterAppearance(WorldPacket & recv_data) SendPacket(&data); } - _player->ModifyMoney(-int32(Cost)); // it isn't free - _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_AT_BARBER, Cost); + _player->ModifyMoney(-int32(cost)); // it isn't free + _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_AT_BARBER, cost); _player->SetByteValue(PLAYER_BYTES, 2, uint8(bs_hair->hair_id)); _player->SetByteValue(PLAYER_BYTES, 3, uint8(Color)); -- cgit v1.2.3 From 5cd9910463b9bad187c3dbdcd06350a329fc823e Mon Sep 17 00:00:00 2001 From: Myran2 Date: Sat, 8 Sep 2012 18:59:06 -0400 Subject: Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game --- sql/updates/world/2012_8_31_00_world_command.sql | 2 + .../world/2012_8_31_01_world_trinity_string.sql | 2 + src/server/game/Miscellaneous/Language.h | 3 +- src/server/scripts/Commands/cs_misc.cpp | 63 +++++++++++++++++----- 4 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 sql/updates/world/2012_8_31_00_world_command.sql create mode 100644 sql/updates/world/2012_8_31_01_world_trinity_string.sql (limited to 'src') diff --git a/sql/updates/world/2012_8_31_00_world_command.sql b/sql/updates/world/2012_8_31_00_world_command.sql new file mode 100644 index 00000000000..28e70f3fa72 --- /dev/null +++ b/sql/updates/world/2012_8_31_00_world_command.sql @@ -0,0 +1,2 @@ +DELETE FROM `command` WHERE `name` = 'start'; +INSERT INTO `command` (`name`, `security`, `help`) VALUES ('unstuck', 0, 'Syntax: .unstuck $playername [inn/graveyard/startzone]\r\n\r\nTeleports specified player to specified location. Default location is player\'s current hearth location.'); \ No newline at end of file diff --git a/sql/updates/world/2012_8_31_01_world_trinity_string.sql b/sql/updates/world/2012_8_31_01_world_trinity_string.sql new file mode 100644 index 00000000000..701c85bce9c --- /dev/null +++ b/sql/updates/world/2012_8_31_01_world_trinity_string.sql @@ -0,0 +1,2 @@ +DELETE FROM `trinity_string` WHERE `entry`=63 LIMIT 1; --Existing entry 63 is not present in Language.h. It's safe to remove it. +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES (63, 'You can\'t do that right now.'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index a766108dbb0..9c4f760fcff 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -86,7 +86,8 @@ enum TrinityStrings LANG_CONNECTED_PLAYERS = 60, LANG_ACCOUNT_ADDON = 61, LANG_IMPROPER_VALUE = 62, - // Room for more level 0 63-99 not used + LANG_CANT_DO_NOW = 63, + // Room for more level 0 64-99 not used // level 1 chat LANG_GLOBAL_NOTIFY = 100, diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index fea96cc80f3..d985671997a 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -81,7 +81,7 @@ public: { "save", SEC_PLAYER, false, &HandleSaveCommand, "", NULL }, { "saveall", SEC_MODERATOR, true, &HandleSaveAllCommand, "", NULL }, { "kick", SEC_GAMEMASTER, true, &HandleKickPlayerCommand, "", NULL }, - { "start", SEC_PLAYER, false, &HandleStartCommand, "", NULL }, + { "unstuck", SEC_PLAYER, true, &HandleUnstuckCommand, "", NULL }, { "linkgrave", SEC_ADMINISTRATOR, false, &HandleLinkGraveCommand, "", NULL }, { "neargrave", SEC_ADMINISTRATOR, false, &HandleNearGraveCommand, "", NULL }, { "showarea", SEC_ADMINISTRATOR, false, &HandleShowAreaCommand, "", NULL }, @@ -928,34 +928,69 @@ public: return true; } - static bool HandleStartCommand(ChatHandler* handler, char const* /*args*/) + static bool HandleUnstuckCommand(ChatHandler* handler, char const* args) { - Player* player = handler->GetSession()->GetPlayer(); + //No args required for players + if (handler->GetSession() && AccountMgr::IsPlayerAccount(handler->GetSession()->GetSecurity())) + { + Player* player = handler->GetSession()->GetPlayer(); + if (player->isInFlight() || player->isInCombat()) + { + handler->SendSysMessage(LANG_CANT_DO_NOW); + handler->SetSentErrorMessage(true); + return false; + } + + //7355: "Stuck" + player->CastSpell(player, 7355, false); + return true; + } + + if (!*args) + return false; + + char* player_str = strtok((char*)args, " "); + if (!player_str) + return false; - if (player->isInFlight()) + char* location_str = strtok(NULL, ""); + if (!location_str) + location_str = "inn"; + + Player* player = NULL; + std::string playerName; + if (!handler->extractPlayerTarget((char*)player_str, &player, NULL, &playerName)) + return false; + + if (player->isInFlight() || player->isInCombat()) { - handler->SendSysMessage(LANG_YOU_IN_FLIGHT); + handler->SendSysMessage(LANG_CANT_DO_NOW); handler->SetSentErrorMessage(true); return false; } - if (player->isInCombat()) + if (!stricmp(location_str, "inn")) { - handler->SendSysMessage(LANG_YOU_IN_COMBAT); - handler->SetSentErrorMessage(true); - return false; + player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, player->GetOrientation()); + return true; } - if (player->isDead() || player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) + if (!stricmp(location_str, "graveyard")) { - // if player is dead and stuck, send ghost to graveyard player->RepopAtGraveyard(); return true; } - // cast spell Stuck - player->CastSpell(player, 7355, false); - return true; + if (!stricmp(location_str, "startzone")) + { + player->TeleportTo(player->GetStartPosition()); + return true; + } + + //Not a supported argument + sLog->outError(LOG_FILTER_GENERAL, "DEBUG: not a supported argument. Args were: %s", args); + return false; + } static bool HandleLinkGraveCommand(ChatHandler* handler, char const* args) -- cgit v1.2.3 From c243185a3a3c0533cb36a376ebf45f513d987b30 Mon Sep 17 00:00:00 2001 From: Myran2 Date: Sat, 8 Sep 2012 19:01:33 -0400 Subject: Removed a line of debug code --- src/server/scripts/Commands/cs_misc.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index d985671997a..835204e1eb9 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -988,7 +988,6 @@ public: } //Not a supported argument - sLog->outError(LOG_FILTER_GENERAL, "DEBUG: not a supported argument. Args were: %s", args); return false; } -- cgit v1.2.3 From d04f155b6529e3d86fca931075775fd34b544e29 Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 9 Sep 2012 00:10:23 +0100 Subject: Corrections to previous merged in PR --- sql/updates/world/2012_09_09_00_world_command.sql | 4 ++++ sql/updates/world/2012_09_09_01_world_trinity_string.sql | 3 +++ sql/updates/world/2012_8_31_00_world_command.sql | 2 -- sql/updates/world/2012_8_31_01_world_trinity_string.sql | 2 -- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- src/server/game/Handlers/CharacterHandler.cpp | 4 ++-- src/server/scripts/Commands/cs_misc.cpp | 6 +++--- 8 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 sql/updates/world/2012_09_09_00_world_command.sql create mode 100644 sql/updates/world/2012_09_09_01_world_trinity_string.sql delete mode 100644 sql/updates/world/2012_8_31_00_world_command.sql delete mode 100644 sql/updates/world/2012_8_31_01_world_trinity_string.sql (limited to 'src') diff --git a/sql/updates/world/2012_09_09_00_world_command.sql b/sql/updates/world/2012_09_09_00_world_command.sql new file mode 100644 index 00000000000..1fb3247bfbb --- /dev/null +++ b/sql/updates/world/2012_09_09_00_world_command.sql @@ -0,0 +1,4 @@ +DELETE FROM `command` WHERE `name` = 'start'; +DELETE FROM `command` WHERE `name` = 'unstuck'; +INSERT INTO `command` (`name`, `security`, `help`) VALUES +('unstuck', 0, 'Syntax: .unstuck $playername [inn/graveyard/startzone]\n\nTeleports specified player to specified location. Default location is player\'s current hearth location.'); diff --git a/sql/updates/world/2012_09_09_01_world_trinity_string.sql b/sql/updates/world/2012_09_09_01_world_trinity_string.sql new file mode 100644 index 00000000000..2f3c0aa1938 --- /dev/null +++ b/sql/updates/world/2012_09_09_01_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=63; -- Existing entry 63 is not present in Language.h. It's safe to remove it. +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(63, 'You can''t do that right now.'); diff --git a/sql/updates/world/2012_8_31_00_world_command.sql b/sql/updates/world/2012_8_31_00_world_command.sql deleted file mode 100644 index 28e70f3fa72..00000000000 --- a/sql/updates/world/2012_8_31_00_world_command.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM `command` WHERE `name` = 'start'; -INSERT INTO `command` (`name`, `security`, `help`) VALUES ('unstuck', 0, 'Syntax: .unstuck $playername [inn/graveyard/startzone]\r\n\r\nTeleports specified player to specified location. Default location is player\'s current hearth location.'); \ No newline at end of file diff --git a/sql/updates/world/2012_8_31_01_world_trinity_string.sql b/sql/updates/world/2012_8_31_01_world_trinity_string.sql deleted file mode 100644 index 701c85bce9c..00000000000 --- a/sql/updates/world/2012_8_31_01_world_trinity_string.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM `trinity_string` WHERE `entry`=63 LIMIT 1; --Existing entry 63 is not present in Language.h. It's safe to remove it. -INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES (63, 'You can\'t do that right now.'); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 55d90ba1c18..dc3fe6b0f0b 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14726,7 +14726,7 @@ bool Player::CanSeeStartQuest(Quest const* quest) bool Player::CanTakeQuest(Quest const* quest, bool msg) { - return !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this) + return !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this) && SatisfyQuestStatus(quest, msg) && SatisfyQuestExclusiveGroup(quest, msg) && SatisfyQuestClass(quest, msg) && SatisfyQuestRace(quest, msg) && SatisfyQuestLevel(quest, msg) && SatisfyQuestSkill(quest, msg) && SatisfyQuestReputation(quest, msg) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1c43c8edd62..737d75cdf1c 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4367,10 +4367,10 @@ int32 Unit::GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) if ((*i)->GetMiscValue() & misc_mask) if (!sSpellMgr->AddSameEffectStackRuleSpellGroups((*i)->GetSpellInfo(), (*i)->GetAmount(), SameEffectSpellGroup)) modifier += (*i)->GetAmount(); - + for (std::map::const_iterator itr = SameEffectSpellGroup.begin(); itr != SameEffectSpellGroup.end(); ++itr) modifier += itr->second; - + return modifier; } diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 5080d668702..39704828d7f 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1312,7 +1312,7 @@ void WorldSession::HandleAlterAppearance(WorldPacket & recv_data) if (!go) { WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4); - data << uint32(2); + data << uint32(2); SendPacket(&data); return; } @@ -1320,7 +1320,7 @@ void WorldSession::HandleAlterAppearance(WorldPacket & recv_data) if (_player->getStandState() != UNIT_STAND_STATE_SIT_LOW_CHAIR + go->GetGOInfo()->barberChair.chairheight) { WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4); - data << uint32(2); + data << uint32(2); SendPacket(&data); return; } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 835204e1eb9..1778dc9be67 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -940,15 +940,15 @@ public: handler->SetSentErrorMessage(true); return false; } - + //7355: "Stuck" player->CastSpell(player, 7355, false); return true; } - + if (!*args) return false; - + char* player_str = strtok((char*)args, " "); if (!player_str) return false; -- cgit v1.2.3