From 56cd48da9d49f4c3cda7d5f661e41d454023940a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 29 May 2020 00:38:12 +0200
Subject: [PATCH] Fixed health bars not hiding

---
 .../character/characterSheetTabs/StatsTab.vue |  2 +-
 .../attributes/HealthBarCardContainer.vue     | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 4b52b42e..6f35ec77 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -292,7 +292,7 @@
 
 <script>
   import Creatures from '/imports/api/creature/Creatures.js';
-	import CreatureProperties, { damageProperty } from '/imports/api/creature/CreatureProperties.js';
+	import { damageProperty } from '/imports/api/creature/CreatureProperties.js';
 	import AttributeCard from '/imports/ui/properties/components/attributes/AttributeCard.vue';
 	import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
index e0ea8dfc..3fbab141 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -7,26 +7,40 @@
 </template>
 
 <script>
-	import CreatureProperties, { damageProperty } from '/imports/api/creature/CreatureProperties.js';
+  import Creatures from '/imports/api/creature/Creatures.js';
+	import { damageProperty } from '/imports/api/creature/CreatureProperties.js';
 	import HealthBarCard from '/imports/ui/properties/components/attributes/HealthBarCard.vue';
+  import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
 
 	export default {
 		components: {
 			HealthBarCard,
 		},
 		props: {
-			creatureId: String,
+			creatureId: {
+        type: String,
+        required: true
+      },
 		},
 		meteor: {
+      creature(){
+        return Creatures.findOne(this.creatureId, {fields: {settings: 1}});
+      },
 			attributes(){
-				return CreatureProperties.find({
-					'ancestors.id': this.creatureId,
-					type: 'attribute',
+        let creature = this.creature;
+        if (!creature) return;
+        let filter = {
+          type: 'attribute',
 					attributeType: 'healthBar',
-          removed: {$ne: true},
-				}, {
-					sort: {order: 1},
-				});
+        };
+        if (creature.settings.hideUnusedStats){
+          filter.hide = {$ne: true};
+        }
+        return getActiveProperties({
+          ancestorId: creature._id,
+          filter,
+          options: {sort: {order: 1}},
+        });
 			},
 		},
 		methods: {