aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/world/2014_03_03_00_world_creature_text.sql (renamed from sql/updates/world/2014_03_03_00_creature_text.sql)0
-rw-r--r--sql/updates/world/2014_03_04_00_world_creature_loot_template.sql13
-rw-r--r--sql/updates/world/2014_03_06_00_world_creature_template.sql3
-rw-r--r--sql/updates/world/2014_03_06_01_world_item_template.sql3
-rw-r--r--sql/updates/world/2014_03_06_02_world_battlemaster_entry.sql6
-rw-r--r--sql/updates/world/2014_03_09_00_world_spell_group.sql7
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp9
-rw-r--r--src/server/scripts/Northrend/zone_storm_peaks.cpp29
8 files changed, 53 insertions, 17 deletions
diff --git a/sql/updates/world/2014_03_03_00_creature_text.sql b/sql/updates/world/2014_03_03_00_world_creature_text.sql
index 97d53e1625b..97d53e1625b 100644
--- a/sql/updates/world/2014_03_03_00_creature_text.sql
+++ b/sql/updates/world/2014_03_03_00_world_creature_text.sql
diff --git a/sql/updates/world/2014_03_04_00_world_creature_loot_template.sql b/sql/updates/world/2014_03_04_00_world_creature_loot_template.sql
new file mode 100644
index 00000000000..4f67d98b4ac
--- /dev/null
+++ b/sql/updates/world/2014_03_04_00_world_creature_loot_template.sql
@@ -0,0 +1,13 @@
+--
+DELETE FROM `creature_loot_template` WHERE `entry` IN(21601,21599);
+INSERT INTO `creature_loot_template` VALUES
+(21601, 23572, 100, 1, 0, 1, 1),
+(21601, 25004, 100, 1, 2, -25004, 1),
+(21601, 25005, 100, 1, 3, -25005, 1),
+(21601, 29434, 100, 1, 0, 1, 1),
+(21601, 33861, -100, 1, 0, 1, 1),
+(21601, 43000, 10, 1, 1, -43000, 1),
+(21601, 43003, 100, 1, 4, -43003, 1);
+
+UPDATE `creature_template` SET `lootid`=21601, `questItem1`=33861 WHERE `entry`=21601;
+UPDATE `creature_template` SET `lootid`=0, `questItem1`=0 WHERE `entry`=21599;
diff --git a/sql/updates/world/2014_03_06_00_world_creature_template.sql b/sql/updates/world/2014_03_06_00_world_creature_template.sql
new file mode 100644
index 00000000000..43e693d2cdb
--- /dev/null
+++ b/sql/updates/world/2014_03_06_00_world_creature_template.sql
@@ -0,0 +1,3 @@
+-- Fix Missing 'gossip' flag (1) so player can choose trainer or vendor window,
+-- current flag (208) only allowed vendor window to appear
+UPDATE `creature_template` SET `npcflag`=209 WHERE entry=33674;
diff --git a/sql/updates/world/2014_03_06_01_world_item_template.sql b/sql/updates/world/2014_03_06_01_world_item_template.sql
new file mode 100644
index 00000000000..198e27f26eb
--- /dev/null
+++ b/sql/updates/world/2014_03_06_01_world_item_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `item_template` SET `spellid_1`=0, `WDBVerified`=-15595 WHERE `entry` IN (2599,40727);
+UPDATE `item_template` SET `spellid_2`=0, `WDBVerified`=-15595 WHERE `entry` IN (32113,32118,32128);
diff --git a/sql/updates/world/2014_03_06_02_world_battlemaster_entry.sql b/sql/updates/world/2014_03_06_02_world_battlemaster_entry.sql
new file mode 100644
index 00000000000..47a679c2c80
--- /dev/null
+++ b/sql/updates/world/2014_03_06_02_world_battlemaster_entry.sql
@@ -0,0 +1,6 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|0x100000 WHERE `entry` IN (16711, 17506, 17507);
+
+DELETE FROM `battlemaster_entry` WHERE `entry` IN (34955, 35008);
+INSERT INTO `battlemaster_entry` (`entry`, `bg_template`) VALUES
+(34955, 32),
+(35008, 32);
diff --git a/sql/updates/world/2014_03_09_00_world_spell_group.sql b/sql/updates/world/2014_03_09_00_world_spell_group.sql
new file mode 100644
index 00000000000..3f9dbffd98f
--- /dev/null
+++ b/sql/updates/world/2014_03_09_00_world_spell_group.sql
@@ -0,0 +1,7 @@
+--
+UPDATE `spell_group` SET `spell_id`=58179 WHERE `id`=1061;
+DELETE FROM `spell_ranks` WHERE `first_spell_id`=58179;
+INSERT INTO `spell_ranks` (`first_spell_id`, `spell_id`, `rank`) VALUES
+(58179,58179,1), -- Infected Wounds (Rank 1)
+(58179,58180,2), -- Infected Wounds (Rank 2)
+(58179,58181,3); -- Infected Wounds (Rank 3)
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 6de8a155d01..d0c21168c80 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -809,10 +809,13 @@ public:
if (handler->HasLowerSecurity(target, 0))
return false;
- char const* kickReason = strtok(NULL, "\r");
std::string kickReasonStr = "No reason";
- if (kickReason != NULL)
- kickReasonStr = kickReason;
+ if (*args != '\0')
+ {
+ char const* kickReason = strtok(NULL, "\r");
+ if (kickReason != NULL)
+ kickReasonStr = kickReason;
+ }
if (sWorld->getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD))
sWorld->SendWorldText(LANG_COMMAND_KICKMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), playerName.c_str(), kickReasonStr.c_str());
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 70de4d4758d..1c6ec703f0c 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -290,22 +290,23 @@ public:
events.ScheduleEvent(EVENT_CHECK_AREA, 5000);
break;
case EVENT_REACHED_HOME:
- Unit* player = me->GetVehicleKit()->GetPassenger(0);
- if (player && player->GetTypeId() == TYPEID_PLAYER)
- {
- // for each prisoner on drake, give credit
- for (uint8 i = 1; i < 4; ++i)
- if (Unit* prisoner = me->GetVehicleKit()->GetPassenger(i))
+ if (Vehicle* vehicle = me->GetVehicleKit())
+ if (Unit* player = vehicle->GetPassenger(0))
+ if (player->GetTypeId() == TYPEID_PLAYER)
{
- if (prisoner->GetTypeId() != TYPEID_UNIT)
- return;
- prisoner->CastSpell(player, SPELL_KILL_CREDIT_PRISONER, true);
- prisoner->CastSpell(prisoner, SPELL_SUMMON_LIBERATED, true);
- prisoner->ExitVehicle();
+ // for each prisoner on drake, give credit
+ for (uint8 i = 1; i < 4; ++i)
+ if (Unit* prisoner = me->GetVehicleKit()->GetPassenger(i))
+ {
+ if (prisoner->GetTypeId() != TYPEID_UNIT)
+ return;
+ prisoner->CastSpell(player, SPELL_KILL_CREDIT_PRISONER, true);
+ prisoner->CastSpell(prisoner, SPELL_SUMMON_LIBERATED, true);
+ prisoner->ExitVehicle();
+ }
+ me->CastSpell(me, SPELL_KILL_CREDIT_DRAKE, true);
+ player->ExitVehicle();
}
- me->CastSpell(me, SPELL_KILL_CREDIT_DRAKE, true);
- player->ExitVehicle();
- }
break;
}
}