diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
index ff30f161aed4093c4cb1c955c0f717b11bab5db6..165d13a419625a2ed6313347742b459c7a90e8ca 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
@@ -583,13 +583,18 @@ public class GamePlay implements Screen {
      */
     public List<Weapon> loadWeapons() {
         List<Weapon> weapons = main.getClient().getMyShip().getInventory();
-        for(Room r : main.getClient().getMyShip().getSystems()) {
-            if(r instanceof System) {
-                if(((System) r).getSystemType() == SystemType.WEAPON_SYSTEM) {
-                    weapons.addAll(((System) r).getShipWeapons());
+
+        //todo: Die Startwaffen sollten beim Spielstart ins Inventory hinzugefügt werden.
+        if(weapons.size() == 0) {
+            for (Room r : main.getClient().getMyShip().getSystems()) {
+                if (r instanceof System) {
+                    if (((System) r).getSystemType() == SystemType.WEAPON_SYSTEM) {
+                        weapons.addAll(((System) r).getShipWeapons());
+                    }
                 }
             }
         }
+        //BIS HIER LÖSCHEN
         return weapons;
     }
 
diff --git a/database.mv.db b/database.mv.db
index c712c040e988a94079633c4dc32fe70538f4569e..7a87282e34745059e6dd0408379ae22a946d0993 100644
Binary files a/database.mv.db and b/database.mv.db differ