0.7.1: update to new pymem version

StarrFox · Aug 21, 2020 · d33fc0c · d33fc0c
1 parent ff4c07d
commit d33fc0c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 31 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wizwalker"
-version = "0.7.0"
+version = "0.7.1"
 description = "Automation bot for wizard101"
 authors = ["StarrFox <[email protected]>"]
 license = "GPL-3.0-or-later"
@@ -10,7 +10,7 @@ python = "^3.8"
 loguru = "^0.5.1"
 aioconsole = "^0.2.1"
 aiofiles = "^0.5.0"
-pymem = "^1.2"
+pymem = "1.3"
 
 [tool.poetry.dev-dependencies]
 pyinstaller = "^3.6"

diff --git a/wizwalker/client.py b/wizwalker/client.py
@@ -72,6 +72,7 @@ async def quest_xyz(self) -> Optional[utils.XYZ]:
     async def health(self) -> Optional[int]:
         """
         Player health if memory hooks are injected, otherwise None
+        Can also be None if the injected function hasn't been triggered yet
         """
         return await self.memory.read_player_health()
 

diff --git a/wizwalker/windows/memory.py b/wizwalker/windows/memory.py
@@ -74,39 +74,19 @@ def hook(self) -> Any:
             self.jump_address, len(self.jump_bytecode)
         )
 
-        # Todo: Fix this whenever pymem is updated
-        # self.memory_handler.process.write_bytes(
-        #     self.hook_address, self.hook_bytecode, len(self.hook_bytecode),
-        # )
-        # self.memory_handler.process.write_bytes(
-        #     self.jump_address, self.jump_bytecode, len(self.jump_bytecode),
-        # )
-        pymem.memory.write_bytes(
-            self.memory_handler.process.process_handle,
-            self.hook_address,
-            self.hook_bytecode,
-            len(self.hook_bytecode),
+        self.memory_handler.process.write_bytes(
+            self.hook_address, self.hook_bytecode, len(self.hook_bytecode),
         )
-        pymem.memory.write_bytes(
-            self.memory_handler.process.process_handle,
-            self.jump_address,
-            self.jump_bytecode,
-            len(self.jump_bytecode),
+        self.memory_handler.process.write_bytes(
+            self.jump_address, self.jump_bytecode, len(self.jump_bytecode),
         )
 
     def unhook(self):
         """
         Deallocates hook memory and rewrites jump addr to it's origional code,
         also called when a client is closed
         """
-        # Todo: fix when pymem updates
-        # self.memory_handler.process.write_bytes(
-        #     self.jump_address,
-        #     self.jump_original_bytecode,
-        #     len(self.jump_original_bytecode),
-        # )
-        pymem.memory.write_bytes(
-            self.memory_handler.process.process_handle,
+        self.memory_handler.process.write_bytes(
             self.jump_address,
             self.jump_original_bytecode,
             len(self.jump_original_bytecode),
@@ -403,7 +383,10 @@ def read_player_health(self):
             return None
 
         stat_addr = self.process.read_int(self.player_stat_addr)
-        return self.process.read_int(stat_addr)
+        try:
+            return self.process.read_int(stat_addr)
+        except pymem.exception.MemoryReadError:
+            return None
 
     @utils.executor_function
     def read_player_mana(self):