yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Spells/Models

Browse Source 
* fixed assigning same display to multiple spells from the same SpellList
 * fixes missing mounts in Profiler
This commit is contained in:
Sarjuuk
2018-11-26 23:18:01 +01:00
parent 04209cfc6d
commit 13db19c64f
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
includes/types/spell.class.php
View File

@@ -684,12 +684,11 @@ class SpellList extends BaseType
$nModels = new CreatureList(array(['id', array_column($displays[TYPE_NPC], 1)])); $nModels = new CreatureList(array(['id', array_column($displays[TYPE_NPC], 1)]));
foreach ($nModels->iterate() as $nId => $__) foreach ($nModels->iterate() as $nId => $__)
{ {
$srcId = 0; foreach ($displays[TYPE_NPC] as $srcId => list($indizes, $npcId))
foreach ($displays[TYPE_NPC] as $srcId => $set) {
if ($set[1] == $nId) if ($npcId == $nId)
break; {
foreach ($indizes as $idx)
foreach ($set[0] as $idx)
{ {
$results[$srcId][$idx] = array( $results[$srcId][$idx] = array(
'typeId' => $nId, 'typeId' => $nId,
@@ -699,18 +698,19 @@ class SpellList extends BaseType
} }
} }
} }
}
}
if (!empty($displays[TYPE_OBJECT])) if (!empty($displays[TYPE_OBJECT]))
{ {
$oModels = new GameObjectList(array(['id', array_column($displays[TYPE_OBJECT], 1)])); $oModels = new GameObjectList(array(['id', array_column($displays[TYPE_OBJECT], 1)]));
foreach ($oModels->iterate() as $oId => $__) foreach ($oModels->iterate() as $oId => $__)
{ {
$srcId = 0; foreach ($displays[TYPE_OBJECT] as $srcId => list($indizes, $objId))
foreach ($displays[TYPE_OBJECT] as $srcId => $set) {
if ($set[1] == $oId) if ($objId == $oId)
break; {
foreach ($indizes as $idx)
foreach ($set[0] as $idx)
{ {
$results[$srcId][$idx] = array( $results[$srcId][$idx] = array(
'typeId' => $oId, 'typeId' => $oId,
@@ -720,6 +720,8 @@ class SpellList extends BaseType
} }
} }
} }
}
}
if ($spellId && $effIdx) if ($spellId && $effIdx)
return !empty($results[$spellId][$effIdx]) ? $results[$spellId][$effIdx] : 0; return !empty($results[$spellId][$effIdx]) ? $results[$spellId][$effIdx] : 0;

1
setup/updates/1543271379_01.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `aowow_dbversion` SET `build` = CONCAT(IFNULL(`build`, ''), ' profiler');