dev #38

Merged
lopar merged 22 commits from dev into master 2021-02-03 08:56:49 +00:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit eb33ef76cf - Show all commits

View File

@ -32,10 +32,10 @@ class DressedItems
public function getItemsInSlots() public function getItemsInSlots()
{ {
$items = self::$db->fetchALL('SELECT * FROM inventory WHERE owner_id = ? AND dressed_slot > 0', $this->USERID); $items = self::$db->ofetchALL('SELECT * FROM inventory WHERE owner_id = ? AND dressed_slot > 0', $this->USERID);
$i = 0; $i = 0;
while ($i < count($items)) { while ($i < count($items)) {
$this->dressedItem[$items['dressed_slot']] = $items; $this->dressedItem[$items[$i]->dressed_slot] = $items;
$i++; $i++;
} }
return $this->dressedItem; return $this->dressedItem;

View File

@ -28,8 +28,8 @@ class EffectsModel
if ($this->DB) { if ($this->DB) {
$i = 0; $i = 0;
while ($i < count($this->DB)) { while ($i < count($this->DB)) {
if ($this->DB->type == self::EFFECT_HIDEUSERINFO) { if ($this->DB[$i]->type == self::EFFECT_HIDEUSERINFO) {
return $this->DB->remaining_time; return $this->DB[$i]->remaining_time;
} }
$i++; $i++;
} }