From 2a0c3a0b78ceb54f0badc4327fc90206c10d25cf Mon Sep 17 00:00:00 2001
From: Spp <spp@jorge.gr>
Date: Tue, 26 Feb 2013 23:20:52 +0100
Subject: sql typo fixes

---
 sql/base/auth_database.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/base/auth_database.sql')

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 2bc5bca0264..2ecc6483a26 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -512,7 +512,7 @@ INSERT INTO `rbac_role_permissions` VALUES
 (23, 21),
 (24, 22),
 (17, 23),
-(34, 24);
+(34, 24),
 (28, 25),
 (30, 26),
 (19, 27),
@@ -593,7 +593,7 @@ INSERT INTO `rbac_roles` VALUES
 (31, 'Join channels without announce'),
 (32, 'Change channel settings without being channel moderator'),
 (33, 'Skip character creation checks'),
-(34, 'Two side faction characters on the same account')
+(34, 'Two side faction characters on the same account'),
 (35, 'See two side who list'),
 (36, 'Add friends of other faction'),
 (37, 'See all security levels with who command'),
-- 
cgit v1.2.3


From 4ea31ce8862cbc1bc4b9c35bc2ff677cbb6c4a16 Mon Sep 17 00:00:00 2001
From: Nay <dnpd.dd@gmail.com>
Date: Tue, 26 Feb 2013 23:49:21 +0000
Subject: Core&SQL: Fix typos (RBAC and equips related)

---
 sql/base/auth_database.sql                     | 245 +------------------------
 sql/updates/auth/2013_02_25_00_auth_misc.sql   |   2 +-
 sql/updates/auth/2013_02_25_11_auth_misc.sql   |   4 +-
 sql/updates/auth/2013_02_25_14_auth_misc.sql   |   2 +-
 src/server/game/Entities/Creature/Creature.cpp |   4 +-
 src/server/game/Handlers/MiscHandler.cpp       |   2 +-
 6 files changed, 13 insertions(+), 246 deletions(-)

(limited to 'sql/base/auth_database.sql')

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 2ecc6483a26..f50a050bf9c 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -265,106 +265,7 @@ CREATE TABLE `rbac_group_roles` (
 
 LOCK TABLES `rbac_group_roles` WRITE;
 /*!40000 ALTER TABLE `rbac_group_roles` DISABLE KEYS */;
-INSERT INTO `rbac_group_roles` VALUES
-(1, 1),
-(2, 2),
-(3, 3),
-(4, 4),
-(2, 5),
-(1, 6),
-(1, 7),
-(2, 8),
-(3, 8),
-(4, 8),
-(2, 9),
-(3, 9),
-(4, 9),
-(2, 10),
-(3, 10),
-(4, 10),
-(2, 11),
-(3, 11),
-(4, 11),
-(2, 12),
-(3, 12),
-(4, 12),
-(2, 13),
-(3, 13),
-(4, 13),
-(2, 14),
-(3, 14),
-(4, 14),
-(2, 15),
-(3, 15),
-(4, 15),
-(2, 16),
-(3, 16),
-(4, 16),
-(2, 17),
-(3, 17),
-(4, 17),
-(4, 18),
-(1, 19),
-(2, 19),
-(3, 19),
-(4, 19),
-(2, 20),
-(3, 20),
-(4, 20),
-(2, 21),
-(3, 21),
-(4, 21),
-(2, 22),
-(3, 22),
-(4, 22),
-(4, 23),
-(2, 24),
-(3, 24),
-(4, 24),
-(2, 25),
-(3, 25),
-(4, 25),
-(2, 26),
-(3, 26),
-(4, 26),
-(2, 27),
-(3, 27),
-(4, 27),
-(1, 28),
-(2, 28),
-(3, 28),
-(4, 28),
-(2, 29),
-(3, 29),
-(4, 29),
-(1, 30),
-(2, 30),
-(3, 30),
-(4, 30),
-(2, 31),
-(3, 31),
-(4, 31),
-(2, 32),
-(3, 32),
-(4, 32),
-(2, 33),
-(3, 33),
-(4, 33),
-(2, 34),
-(3, 34),
-(4, 34),
-(2, 35),
-(3, 35),
-(4, 35),
-(2, 36),
-(3, 36),
-(4, 36),
-(2, 37),
-(3, 37),
-(4, 37),
-(2, 38),
-(3, 38),
-(4, 38);
+INSERT INTO `rbac_group_roles` VALUES (1,1),(2,2),(3,3),(4,4),(2,5),(1,6),(1,7),(2,8),(3,8),(4,8),(2,9),(3,9),(4,9),(2,10),(3,10),(4,10),(2,11),(3,11),(4,11),(2,12),(3,12),(4,12),(2,13),(3,13),(4,13),(2,14),(3,14),(4,14),(2,15),(3,15),(4,15),(2,16),(3,16),(4,16),(2,17),(3,17),(4,17),(4,18),(1,19),(2,19),(3,19),(4,19),(2,20),(3,20),(4,20),(2,21),(3,21),(4,21),(2,22),(3,22),(4,22),(4,23),(2,24),(3,24),(4,24),(2,25),(3,25),(4,25),(2,26),(3,26),(4,26),(2,27),(3,27),(4,27),(1,28),(2,28),(3,28),(4,28),(2,29),(3,29),(4,29),(1,30),(2,30),(3,30),(4,30),(2,31),(3,31),(4,31),(2,32),(3,32),(4,32),(2,33),(3,33),(4,33),(2,34),(3,34),(4,34),(2,35),(3,35),(4,35),(2,36),(3,36),(4,36),(2,37),(3,37),(4,37),(2,38),(3,38),(4,38);
 /*!40000 ALTER TABLE `rbac_group_roles` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -388,11 +289,7 @@ CREATE TABLE `rbac_groups` (
 
 LOCK TABLES `rbac_groups` WRITE;
 /*!40000 ALTER TABLE `rbac_groups` DISABLE KEYS */;
-INSERT INTO `rbac_groups` VALUES
-(1,'Player'),
-(2,'Moderator'),
-(3,'GameMaster'),
-(4,'Administrator');
+INSERT INTO `rbac_groups` VALUES (1,'Player'),(2,'Moderator'),(3,'GameMaster'),(4,'Administrator');
 /*!40000 ALTER TABLE `rbac_groups` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -416,53 +313,7 @@ CREATE TABLE `rbac_permissions` (
 
 LOCK TABLES `rbac_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_permissions` VALUES
-(1, 'Instant logout'),
-(2, 'Skip Queue'),
-(3, 'Join Normal Battleground'),
-(4, 'Join Random Battleground'),
-(5, 'Join Arenas'),
-(6, 'Join Dungeon Finder'),
-(7, 'Player Commands (Temporal till commands moved to rbac)'),
-(8, 'Moderator Commands (Temporal till commands moved to rbac)'),
-(9, 'GameMaster Commands (Temporal till commands moved to rbac)'),
-(10, 'Administrator Commands (Temporal till commands moved to rbac)'),
-(11, 'Log GM trades'),
-(13, 'Skip Instance required bosses check'),
-(14, 'Skip character creation team mask check'),
-(15, 'Skip character creation class mask check'),
-(16, 'Skip character creation race mask check'),
-(17, 'Skip character creation reserved name check'),
-(18, 'Skip character creation heroic min level check'),
-(19, 'Skip needed requirements to use channel check'),
-(20, 'Skip disable map check'),
-(21, 'Skip reset talents when used more than allowed check'),
-(22, 'Skip spam chat check'),
-(23, 'Skip over-speed ping check'),
-(24, 'Two side faction characters on the same account'),
-(25, 'Allow say chat between factions'),
-(26, 'Allow channel chat between factions'),
-(27, 'Two side mail interaction'),
-(28, 'See two side who list'),
-(29, 'Add friends of other faction'),
-(30, 'Save character without delay with .save command'),
-(31, 'Use params with .unstuck command'),
-(32, 'Can be assigned tickets with .assign ticket command'),
-(33, 'Notify if a command was not found'),
-(34, 'Check if should appear in list using .gm ingame command'),
-(35, 'See all security levels with who command'),
-(36, 'Filter whispers'),
-(37, 'Use staff badge in chat'),
-(38, 'Resurrect with full Health Points'),
-(39, 'Restore saved gm setting states'),
-(40, 'Allows to add a gm to friend list'),
-(41, 'Use Config option START_GM_LEVEL to assign new character level'),
-(42, 'Allows to use CMSG_WORLD_TELEPORT opcode'),
-(43, 'Allows to use CMSG_WHOIS opcode'),
-(44, 'Receive global GM messages/texts'),
-(45, 'Join channels without announce'),
-(46, 'Change channel settings without being channel moderator'),
-(47, 'Enables lower security than target check');
+INSERT INTO `rbac_permissions` VALUES (1,'Instant logout'),(2,'Skip Queue'),(3,'Join Normal Battleground'),(4,'Join Random Battleground'),(5,'Join Arenas'),(6,'Join Dungeon Finder'),(7,'Player Commands (Temporal till commands moved to rbac)'),(8,'Moderator Commands (Temporal till commands moved to rbac)'),(9,'GameMaster Commands (Temporal till commands moved to rbac)'),(10,'Administrator Commands (Temporal till commands moved to rbac)'),(11,'Log GM trades'),(13,'Skip Instance required bosses check'),(14,'Skip character creation team mask check'),(15,'Skip character creation class mask check'),(16,'Skip character creation race mask check'),(17,'Skip character creation reserved name check'),(18,'Skip character creation heroic min level check'),(19,'Skip needed requirements to use channel check'),(20,'Skip disable map check'),(21,'Skip reset talents when used more than allowed check'),(22,'Skip spam chat check'),(23,'Skip over-speed ping check'),(24,'Two side faction characters on the same account'),(25,'Allow say chat between factions'),(26,'Allow channel chat between factions'),(27,'Two side mail interaction'),(28,'See two side who list'),(29,'Add friends of other faction'),(30,'Save character without delay with .save command'),(31,'Use params with .unstuck command'),(32,'Can be assigned tickets with .assign ticket command'),(33,'Notify if a command was not found'),(34,'Check if should appear in list using .gm ingame command'),(35,'See all security levels with who command'),(36,'Filter whispers'),(37,'Use staff badge in chat'),(38,'Resurrect with full Health Points'),(39,'Restore saved gm setting states'),(40,'Allows to add a gm to friend list'),(41,'Use Config option START_GM_LEVEL to assign new character level'),(42,'Allows to use CMSG_WORLD_TELEPORT opcode'),(43,'Allows to use CMSG_WHOIS opcode'),(44,'Receive global GM messages/texts'),(45,'Join channels without announce'),(46,'Change channel settings without being channel moderator'),(47,'Enables lower security than target check');
 /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -489,53 +340,7 @@ CREATE TABLE `rbac_role_permissions` (
 
 LOCK TABLES `rbac_role_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_role_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_role_permissions` VALUES
-(5, 1),
-(5, 2),
-(6, 3),
-(6, 4),
-(6, 5),
-(7, 6),
-(1, 7),
-(2, 8),
-(3, 9),
-(4, 10),
-(8, 11),
-(9, 13),
-(33, 14),
-(33, 15),
-(33, 16),
-(33, 17),
-(33, 18),
-(27, 19),
-(22, 20),
-(23, 21),
-(24, 22),
-(17, 23),
-(34, 24),
-(28, 25),
-(30, 26),
-(19, 27),
-(35, 28),
-(36, 29),
-(11, 30),
-(12, 31),
-(10, 32),
-(20, 33),
-(14, 34),
-(37, 35),
-(29, 36),
-(15, 37),
-(13, 38),
-(25, 39),
-(38, 40),
-(26, 41),
-(18, 42),
-(18, 43),
-(16, 44),
-(31, 45),
-(32, 46),
-(21, 47);
+INSERT INTO `rbac_role_permissions` VALUES (5,1),(5,2),(6,3),(6,4),(6,5),(7,6),(1,7),(2,8),(3,9),(4,10),(8,11),(9,13),(33,14),(33,15),(33,16),(33,17),(33,18),(27,19),(22,20),(23,21),(24,22),(17,23),(34,24),(28,25),(30,26),(19,27),(35,28),(36,29),(11,30),(12,31),(10,32),(20,33),(14,34),(37,35),(29,36),(15,37),(13,38),(25,39),(38,40),(26,41),(18,42),(18,43),(16,44),(31,45),(32,46),(21,47);
 /*!40000 ALTER TABLE `rbac_role_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -559,45 +364,7 @@ CREATE TABLE `rbac_roles` (
 
 LOCK TABLES `rbac_roles` WRITE;
 /*!40000 ALTER TABLE `rbac_roles` DISABLE KEYS */;
-INSERT INTO `rbac_roles` VALUES
-(1, 'Player Commands'),
-(2, 'Moderator Commands'),
-(3, 'GameMaster Commands'),
-(4, 'Administrator Commands'),
-(5, 'Quick Login/Logout'),
-(6, 'Use Battleground/Arenas'),
-(7, 'Use Dungeon Finder'),
-(8, 'Log GM trades'),
-(9, 'Skip Instance required bosses check'),
-(10, 'Ticket management'),
-(11, 'Instant .save'),
-(12, 'Allow params with .unstuck'),
-(13, 'Full HP after resurrect'),
-(14, 'Appear in GM ingame list'),
-(15, 'Use staff badge in chat'),
-(16, 'Receive global GM messages/texts'),
-(17, 'Skip over-speed ping check'),
-(18, 'Allows Admin Opcodes'),
-(19, 'Two side mail interaction'),
-(20, 'Notify if a command was not found'),
-(21, 'Enables lower security than target check'),
-(22, 'Skip disable map check'),
-(23, 'Skip reset talents when used more than allowed check'),
-(24, 'Skip spam chat check'),
-(25, 'Restore saved gm setting states'),
-(26, 'Use Config option START_GM_LEVEL to assign new character level'),
-(27, 'Skips needed requirements to use channel check'),
-(28, 'Allow say chat between factions'),
-(29, 'Filter whispers'),
-(30, 'Allow channel chat between factions'),
-(31, 'Join channels without announce'),
-(32, 'Change channel settings without being channel moderator'),
-(33, 'Skip character creation checks'),
-(34, 'Two side faction characters on the same account'),
-(35, 'See two side who list'),
-(36, 'Add friends of other faction'),
-(37, 'See all security levels with who command'),
-(38, 'Allows to add a gm to friend list');
+INSERT INTO `rbac_roles` VALUES (1,'Player Commands'),(2,'Moderator Commands'),(3,'GameMaster Commands'),(4,'Administrator Commands'),(5,'Quick Login/Logout'),(6,'Use Battleground/Arenas'),(7,'Use Dungeon Finder'),(8,'Log GM trades'),(9,'Skip Instance required bosses check'),(10,'Ticket management'),(11,'Instant .save'),(12,'Allow params with .unstuck'),(13,'Full HP after resurrect'),(14,'Appear in GM ingame list'),(15,'Use staff badge in chat'),(16,'Receive global GM messages/texts'),(17,'Skip over-speed ping check'),(18,'Allows Admin Opcodes'),(19,'Two side mail interaction'),(20,'Notify if a command was not found'),(21,'Enables lower security than target check'),(22,'Skip disable map check'),(23,'Skip reset talents when used more than allowed check'),(24,'Skip spam chat check'),(25,'Restore saved gm setting states'),(26,'Use Config option START_GM_LEVEL to assign new character level'),(27,'Skip needed requirements to use channel check'),(28,'Allow say chat between factions'),(29,'Filter whispers'),(30,'Allow channel chat between factions'),(31,'Join channels without announce'),(32,'Change channel settings without being channel moderator'),(33,'Skip character creation checks'),(34,'Two side faction characters on the same account'),(35,'See two side who list'),(36,'Add friends of other faction'),(37,'See all security levels with who command'),(38,'Allows to add a gm to friend list');
 /*!40000 ALTER TABLE `rbac_roles` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -722,4 +489,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2013-02-04 16:07:23
+-- Dump completed on 2013-02-26 23:48:17
diff --git a/sql/updates/auth/2013_02_25_00_auth_misc.sql b/sql/updates/auth/2013_02_25_00_auth_misc.sql
index 3cce3c0d5ce..8769060ba9d 100644
--- a/sql/updates/auth/2013_02_25_00_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_00_auth_misc.sql
@@ -1,5 +1,5 @@
 ALTER TABLE `rbac_roles` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Role name';
-ALTER TABLE `rbac_roles` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Group name';
+ALTER TABLE `rbac_groups` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Group name';
 
 -- Add new permission
 DELETE FROM `rbac_permissions` WHERE `id` = 11;
diff --git a/sql/updates/auth/2013_02_25_11_auth_misc.sql b/sql/updates/auth/2013_02_25_11_auth_misc.sql
index 90c19526b06..b5f9767ca7b 100644
--- a/sql/updates/auth/2013_02_25_11_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_11_auth_misc.sql
@@ -1,14 +1,14 @@
 -- Add new permissions
 DELETE FROM `rbac_permissions` WHERE `id` IN (19, 25, 36);
 INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
-(19, 'Skips needed requirements to use channel check'),
+(19, 'Skip needed requirements to use channel check'),
 (25, 'Allow say chat between factions'),
 (36, 'Filter whispers');
 
 -- Add new role
 DELETE FROM `rbac_roles` WHERE `id` IN (27, 28, 29);
 INSERT INTO `rbac_roles` (`id`, `name`) VALUES
-(27, 'Skips needed requirements to use channel check'),
+(27, 'Skip needed requirements to use channel check'),
 (28, 'Allow say chat between factions'),
 (29, 'Filter whispers');
 
diff --git a/sql/updates/auth/2013_02_25_14_auth_misc.sql b/sql/updates/auth/2013_02_25_14_auth_misc.sql
index f88280feae7..59189304342 100644
--- a/sql/updates/auth/2013_02_25_14_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_14_auth_misc.sql
@@ -7,7 +7,7 @@ INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
 (40, 'Allows to add a gm to friend list');
 
 -- Add new role
-DELETE FROM `rbac_roles` WHERE `id` IN (33, 34);
+DELETE FROM `rbac_roles` WHERE `id` IN (35, 36, 37, 38);
 INSERT INTO `rbac_roles` (`id`, `name`) VALUES
 (35, 'See two side who list'),
 (36, 'Add friends of other faction'),
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 39534c1c2bf..4d549b3b046 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -322,8 +322,8 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData* data
     SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
 
     // Load creature equipment
-    if (!data || data->equipmentId == 0)                    // use default from the template
-        LoadEquipment(GetOriginalEquipmentId());
+    if (!data || data->equipmentId == 0)
+        LoadEquipment(); // use default equipment (if available)
     else if (data && data->equipmentId != 0)                // override, 0 means no equipment
     {
         m_originalEquipmentId = data->equipmentId;
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 2a4f4a15037..3cd937216b8 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1259,7 +1259,7 @@ void WorldSession::HandleWhoisOpcode(WorldPacket& recvData)
     std::string charname;
     recvData >> charname;
 
-    if (HasPermission(RBAC_PERM_OPCODE_WHOIS))
+    if (!HasPermission(RBAC_PERM_OPCODE_WHOIS))
     {
         SendNotification(LANG_YOU_NOT_HAVE_PERMISSION);
         return;
-- 
cgit v1.2.3

