Hay1tsme/artemis
30
52
Fork 48
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into per_version_uri_host

Browse Source
This commit is contained in:
Hay1tsme
2023-11-08 21:08:42 -05:00
parent bf4acab773 c2a330f42c
commit 1fe6ef4a55
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,6 +1,6 @@
FROM python:3.9.15-slim-bullseye FROM python:3.9.15-slim-bullseye
RUN apt update && apt install default-libmysqlclient-dev build-essential libtk nodejs npm -y RUN apt update && apt install default-libmysqlclient-dev build-essential libtk nodejs npm pkg-config -y
WORKDIR /app WORKDIR /app
COPY requirements.txt requirements.txt COPY requirements.txt requirements.txt
@ -15,7 +15,7 @@ COPY dbutils.py dbutils.py
COPY read.py read.py COPY read.py read.py
ADD core core ADD core core
ADD titles titles ADD titles titles
ADD log log ADD logs logs
ADD cert cert ADD cert cert
ENTRYPOINT [ "/app/entrypoint.sh" ] ENTRYPOINT [ "/app/entrypoint.sh" ]

2
titles/cxb/base.py
View File

@ -536,7 +536,6 @@ class CxbBase:
profile = self.data.profile.get_profile_index(0, uid, self.version) profile = self.data.profile.get_profile_index(0, uid, self.version)
data1 = profile["data"] data1 = profile["data"]
p = self.data.item.get_energy(uid) p = self.data.item.get_energy(uid)
energy = p["energy"]
if not p: if not p:
self.data.item.put_energy(uid, 5) self.data.item.put_energy(uid, 5)
@ -549,6 +548,7 @@ class CxbBase:
} }
array = [] array = []
energy = p["energy"]
newenergy = int(energy) + 5 newenergy = int(energy) + 5
self.data.item.put_energy(uid, newenergy) self.data.item.put_energy(uid, newenergy)