From 84aeec895ae85414af28bc86ec51ca99c002f489 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Sun, 7 Mar 2021 16:33:12 +0100
Subject: [PATCH] Remove singelton fix bugs

---
 PlayerState.py                     | 1 +
 __main__.py                        | 5 +++--
 events/LeaveUpperPlayfieldEvent.py | 2 +-
 lamps/Lamp.py                      | 2 +-
 networking/Networking.py           | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/PlayerState.py b/PlayerState.py
index 4a2420b..17ac5af 100644
--- a/PlayerState.py
+++ b/PlayerState.py
@@ -221,6 +221,7 @@ class PlayerState:
     def updatePlayfieldTime(self):
         if self.upperPlayfieldTime == 0:
             self.upperPlayfieldTimer = None
+            LeaveUpperPlayfieldEvent(self, )
             return
 
         if self.upperPlayfieldTime in [0, 5, 10, 20]:
diff --git a/__main__.py b/__main__.py
index 8063e06..36e6ef2 100644
--- a/__main__.py
+++ b/__main__.py
@@ -1,13 +1,13 @@
+networking = None
+
 import argparse
 import config
 
 from factories.NetworkFactory import NetworkFactory
-from factories.GameFactory import GameFactory
 
 import asyncio
 import logging
 
-networking = None
 
 def main():
     args = parseCommandLine()
@@ -36,6 +36,7 @@ def createGame(args):
     print(args)
     global networking
     networking = NetworkFactory.createNetwork(args.OutputServerAddress, args.InputServerAddress)
+    from factories.GameFactory import GameFactory
     game = GameFactory().createGame()
     return game
 
diff --git a/events/LeaveUpperPlayfieldEvent.py b/events/LeaveUpperPlayfieldEvent.py
index e1c2000..75b41f7 100644
--- a/events/LeaveUpperPlayfieldEvent.py
+++ b/events/LeaveUpperPlayfieldEvent.py
@@ -3,7 +3,7 @@ from solenoids.TopFlipper import TopFlipper
 
 
 class LeaveUpperPlayfieldEvent(Event):
-    def __init__(self, playerState, flipper):
+    def __init__(self, playerState):
         self.playerState = playerState
         self.flipper = TopFlipper()
         super().__init__("Leave Upper Playfield Event")
diff --git a/lamps/Lamp.py b/lamps/Lamp.py
index 52742a5..a5f31a2 100644
--- a/lamps/Lamp.py
+++ b/lamps/Lamp.py
@@ -8,7 +8,7 @@ class Lamp:
         networking.activateLamp(self)
 
     def deactivate(self):
-        networking.deactivateLamp()
+        networking.deactivateLamp(self)
 
     def isActivated(self):
         networking.getLamps(self)
diff --git a/networking/Networking.py b/networking/Networking.py
index aef0654..41b86d1 100644
--- a/networking/Networking.py
+++ b/networking/Networking.py
@@ -1,7 +1,6 @@
 import requests_unixsocket as req
 import socket
 import json
-import asyncio
 
 
 class Networking: