From f034a9bd0ac92eb9234e3ee1c47996fc8e7b1093 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Fri, 19 Nov 2010 17:00:14 +0300
Subject: [PATCH] [10746] Use objetguid for other .list auras command part

---
 sql/mangos.sql                                | 4 ++--
 sql/updates/10746_01_mangos_mangos_string.sql | 6 ++++++
 sql/updates/Makefile.am                       | 2 ++
 src/game/Level3.cpp                           | 4 ++--
 src/shared/revision_nr.h                      | 2 +-
 src/shared/revision_sql.h                     | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 sql/updates/10746_01_mangos_mangos_string.sql

diff --git a/sql/mangos.sql b/sql/mangos.sql
index ec7581c6f..3ab9a3d00 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_10743_02_mangos_spell_bonus_data` bit(1) default NULL
+  `required_10746_01_mangos_mangos_string` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -3416,7 +3416,7 @@ INSERT INTO `mangos_string` VALUES
 (465,'Teleport location deleted.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (466,'No taxinodes found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (467,'Target unit has %d auras:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(468,'id: %d eff: %d type: %d duration: %d maxduration: %d name: %s%s%s caster: %s %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(468,'id: %d eff: %d type: %d duration: %d maxduration: %d name: %s%s%s caster: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (469,'Target unit has %d auras of type %d:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (470,'id: %d eff: %d name: %s%s%s caster: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (471,'Quest %u not found.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/10746_01_mangos_mangos_string.sql b/sql/updates/10746_01_mangos_mangos_string.sql
new file mode 100644
index 000000000..b3c6885f9
--- /dev/null
+++ b/sql/updates/10746_01_mangos_mangos_string.sql
@@ -0,0 +1,6 @@
+ALTER TABLE db_version CHANGE COLUMN required_10743_02_mangos_spell_bonus_data required_10746_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry IN (468);
+
+INSERT INTO mangos_string VALUES
+(468,'id: %d eff: %d type: %d duration: %d maxduration: %d name: %s%s%s caster: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index dea3edc04..380fd0f07 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -121,6 +121,7 @@ pkgdata_DATA = \
 	10742_01_mangos_spell_bonus_data.sql \
 	10743_01_mangos_spell_chain.sql \
 	10743_02_mangos_spell_bonus_data.sql \
+	10746_01_mangos_mangos_string.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -222,4 +223,5 @@ EXTRA_DIST = \
 	10742_01_mangos_spell_bonus_data.sql \
 	10743_01_mangos_spell_chain.sql \
 	10743_02_mangos_spell_bonus_data.sql \
+	10746_01_mangos_mangos_string.sql \
 	README
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index c40f1e2c5..07ddda67f 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -4594,7 +4594,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
                     aur->GetModifier()->m_auraname, aur->GetAuraDuration(), aur->GetAuraMaxDuration(),
                     ss_name.str().c_str(),
                     (holder->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""),
-                    IS_PLAYER_GUID(holder->GetCasterGUID()) ? "player" : "creature",GUID_LOPART(holder->GetCasterGUID()));
+                    holder->GetCasterGuid().GetString().c_str());
             }
             else
             {
@@ -4602,7 +4602,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
                     aur->GetModifier()->m_auraname, aur->GetAuraDuration(), aur->GetAuraMaxDuration(),
                     name,
                     (holder->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""),
-                    IS_PLAYER_GUID(holder->GetCasterGUID()) ? "player" : "creature",GUID_LOPART(holder->GetCasterGUID()));
+                    holder->GetCasterGuid().GetString().c_str());
             }
         }
     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index c222bfe47..2d28f1360 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10745"
+ #define REVISION_NR "10746"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index 527573840..8fffd8680 100644
--- a/src/shared/revision_sql.h
+++ b/src/shared/revision_sql.h
@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_10664_01_characters_arena_team_stats"
- #define REVISION_DB_MANGOS "required_10743_02_mangos_spell_bonus_data"
+ #define REVISION_DB_MANGOS "required_10746_01_mangos_mangos_string"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__