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

Misc/Fixup

Browse Source 
* Profiler: handle items with invalid enchantments
 * Profiler: convert (last?) forgotten INSERT IGNORE to ON DUPLICATE KEY UPDATE id=id
 * Areatrigger: fix null related tabs
 * LatestComments: fix lv template for replies
 * Conditions: fixed tab names for locale DE
This commit is contained in:
Sarjuuk
2024-07-08 16:13:51 +02:00
parent 828fa40d4b
commit 92a6e0122f
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/profiler.class.php
View File

@@ -533,8 +533,14 @@ class Profiler
// cant reasonably get to the castItem from enchantId and slot // cant reasonably get to the castItem from enchantId and slot
$profSpec = DB::Aowow()->selectCol('SELECT id AS ARRAY_KEY, skillLevel AS "1", skillLine AS "0" FROM ?_itemenchantment WHERE id IN (?a)', $permEnch); $profSpec = DB::Aowow()->selectCol('SELECT id AS ARRAY_KEY, skillLevel AS "1", skillLine AS "0" FROM ?_itemenchantment WHERE id IN (?a)', $permEnch);
foreach ($permEnch as $eId) foreach ($permEnch as $slot => $eId)
{ {
if (!isset($profSpec[$eId]))
{
trigger_error('char #'.$charGuid.' on realm #'.$realmId.' has item in slot #'.$slot.' with invalid perm enchantment #'.CLI::bold($eId), E_USER_WARNING);
continue;
}
if ($x = Util::getEnchantmentScore(0, 0, !!$profSpec[$eId][1], $eId)) if ($x = Util::getEnchantmentScore(0, 0, !!$profSpec[$eId][1], $eId))
$data['gearscore'] += $x; $data['gearscore'] += $x;
else if ($profSpec[$eId][0] != 776) // not runeforging else if ($profSpec[$eId][0] != 776) // not runeforging

2
includes/types/arenateam.class.php
View File

@@ -314,7 +314,7 @@ class RemoteArenaTeamList extends ArenaTeamList
} }
foreach (Util::createSqlBatchInsert($memberData) as $ins) foreach (Util::createSqlBatchInsert($memberData) as $ins)
DB::Aowow()->query('INSERT IGNORE INTO ?_profiler_arena_team_member (?#) VALUES '.$ins, array_keys(reset($memberData))); DB::Aowow()->query('INSERT INTO ?_profiler_arena_team_member (?#) VALUES '.$ins.' ON DUPLICATE KEY UPDATE `id` = `id`', array_keys(reset($memberData)));
} }
} }
} }

2
pages/areatrigger.php
View File

@@ -87,7 +87,7 @@ class AreaTriggerPage extends GenericPage
// tab: conditions // tab: conditions
$cnd = new Conditions(); $cnd = new Conditions();
$cnd->getBySourceEntry($this->typeId, Conditions::SRC_AREATRIGGER_CLIENT)->prepare(); $cnd->getBySourceEntry($this->typeId, Conditions::SRC_AREATRIGGER_CLIENT)->prepare();
if ($tab = $cnd->toListviewTab()); if ($tab = $cnd->toListviewTab())
{ {
$this->extendGlobalData($cnd->getJsGlobals()); $this->extendGlobalData($cnd->getJsGlobals());
$this->lvTabs[] = $tab; $this->lvTabs[] = $tab;

2
pages/utility.php
View File

@@ -114,7 +114,7 @@ class UtilityPage extends GenericPage
$this->lvTabs[] = ['commentpreview', ['data' => $comments]]; $this->lvTabs[] = ['commentpreview', ['data' => $comments]];
array_walk($replies, fn(&$d) => $d['date'] = date(Util::$dateFormatInternal, $d['date'])); array_walk($replies, fn(&$d) => $d['date'] = date(Util::$dateFormatInternal, $d['date']));
$this->lvTabs[] = ['commentpreview', ['data' => $replies]]; $this->lvTabs[] = ['replypreview', ['data' => $replies]];
} }
break; break;

4
static/js/locale_dede.js
View File

@@ -4894,8 +4894,8 @@ var LANG = {
/* AoWoW: start custom */ /* AoWoW: start custom */
tab_conditions: 'Bedingungen', tab_conditions: 'Konditionen',
tab_condition_for: 'Bedingung for', tab_condition_for: 'Kondition für',
cnd_either: 'Entweder', cnd_either: 'Entweder',
cnd_or: 'Oder', cnd_or: 'Oder',