From 4e174c0b175985352b524889b9f0e780386e67b4 Mon Sep 17 00:00:00 2001
From: Thomas Kosel <thomas.kosel@gmx.de>
Date: Wed, 28 Jul 2021 21:13:09 +0200
Subject: [PATCH] #918 reverting wrongly merged inventory related changes.

---
 common/systems/src/character_behavior.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/systems/src/character_behavior.rs b/common/systems/src/character_behavior.rs
index 02f60bd8f1..80d3586d2f 100644
--- a/common/systems/src/character_behavior.rs
+++ b/common/systems/src/character_behavior.rs
@@ -74,6 +74,7 @@ pub struct ReadData<'a> {
     combos: ReadStorage<'a, Combo>,
     alignments: ReadStorage<'a, comp::Alignment>,
     terrain: ReadExpect<'a, TerrainGrid>,
+    inventories: ReadStorage<'a, Inventory>,
 }
 
 /// ## Character Behavior System
@@ -92,7 +93,6 @@ impl<'a> System<'a> for Sys {
         WriteStorage<'a, Ori>,
         WriteStorage<'a, Density>,
         WriteStorage<'a, Energy>,
-        WriteStorage<'a, Inventory>,
         WriteStorage<'a, Controller>,
         WriteStorage<'a, Poise>,
         Write<'a, Vec<Outcome>>,
@@ -112,7 +112,6 @@ impl<'a> System<'a> for Sys {
             mut orientations,
             mut densities,
             mut energies,
-            mut inventories,
             mut controllers,
             mut poises,
             mut outcomes,
@@ -148,7 +147,7 @@ impl<'a> System<'a> for Sys {
             &read_data.masses,
             &mut densities,
             &mut energies,
-            &mut inventories,
+            read_data.inventories.maybe(),
             &mut controllers,
             read_data.healths.maybe(),
             &read_data.bodies,
@@ -283,7 +282,7 @@ impl<'a> System<'a> for Sys {
                 mass,
                 density: &mut density,
                 energy,
-                inventory: Some(&inventory),
+                inventory,
                 controller: &mut controller,
                 health,
                 body,