Skip to content

Commit 8bdec18

Browse files
committed
Be safer in load_events() for weird cases.
1 parent 7faf7fd commit 8bdec18

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sc2reader/resources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ def load_events(self):
472472
self.events = sorted(self.events, key=lambda e: e.frame)
473473

474474
# hideous hack for HotS 2.0.0.23925, see https://github.com/GraylinKim/sc2reader/issues/87
475-
if self.events[-1].frame > self.frames:
475+
if self.events and self.events[-1].frame > self.frames:
476476
self.frames = self.events[-1].frame
477477
self.length = utils.Length(seconds=int(self.frames/self.game_fps))
478478

@@ -493,7 +493,7 @@ def load_events(self):
493493

494494
event.load_context(self)
495495
# TODO: Should this be documented or removed? I don't like it.
496-
if event.pid != 16:
496+
if event.pid != 16 and hasattr(event,'player'):
497497
event.player.events.append(event)
498498
if is_camera:
499499
event.player.camera_events.append(event)

0 commit comments

Comments
 (0)