nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-14 17:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Docker): update to Ubuntu 20.04 + more improvements (#3277)

Browse Source
This commit is contained in:
Francesco Borzì
2020-08-13 00:25:20 +02:00
committed by GitHub
parent c83c53e718
commit d2cc3fcbc2
14 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -1308,7 +1308,7 @@ public:
//if (team == ~uint32(0))
// handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id);
//else
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
}
return true;
@@ -3067,7 +3067,7 @@ public:
group->SendUpdate();
}
return true;
return true;
}
static bool HandleGroupDisbandCommand(ChatHandler* handler, char const* args)

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
View File

@@ -88,7 +88,7 @@ public:
//}
//else
//{
HandOfThaurissan_Timer = 5000;
HandOfThaurissan_Timer = 5000;
//Counter = 0;
//}
} else HandOfThaurissan_Timer -= diff;

9
src/server/scripts/EasternKingdoms/zone_undercity.cpp
View File

@@ -2052,8 +2052,13 @@ public:
break;
case EVENT_AGGRO_JAINA:
if (me->GetVictim())
if (Creature* jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
jaina->AI()->AttackStart(me->GetVictim()); DoCast(me, SPELL_THUNDER);
{
if (Creature *jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
{
jaina->AI()->AttackStart(me->GetVictim());
}
}
DoCast(me, SPELL_THUNDER);
_events.ScheduleEvent(EVENT_AGGRO_JAINA, 2 * IN_MILLISECONDS);
break;
case EVENT_WRYNN_BUFF:

11
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View File

@@ -1077,10 +1077,11 @@ public:
break;
case EVENT_ARGENT_CHALLENGE_MOVE_FORWARD:
{
if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID))
if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) {
boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f);
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000);
events.PopEvent();
}
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000);
events.PopEvent();
}
break;
case EVENT_ARGENT_CHALLENGE_ATTACK:
@@ -1152,8 +1153,8 @@ public:
bk->ToCreature()->SetReactState(REACT_PASSIVE);
}
announcer->SetFacingToObject(bk_vehicle);
announcer->AI()->Talk(TEXT_BK_RAFTERS);
announcer->SetFacingToObject(bk_vehicle);
announcer->AI()->Talk(TEXT_BK_RAFTERS);
}
events.PopEvent();
}

2
src/server/scripts/Outland/zone_blades_edge_mountains.cpp
View File

@@ -157,7 +157,7 @@ public:
me->SummonCreature(NPC_HOUND, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
else
me->SummonCreature(NPC_FEL_IMP, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
events.ScheduleEvent(EVENT_PARTY_TIMER, 3000);
events.ScheduleEvent(EVENT_PARTY_TIMER, 3000);
break;
}
}

6
src/server/scripts/World/item_scripts.cpp
View File

@@ -48,15 +48,15 @@ public:
case 24538:
if (player->GetAreaId() != 3628)
disabled = true;
break;
break;
case 34489:
if (player->GetZoneId() != 4080)
disabled = true;
break;
break;
case 34475:
if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES))
Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
break;
break;
}
// allow use in flight only