See Argus-Labs/world-engine@78ec35b from refs/heads/main

Argus-Labs · Feb 5, 2024 · 62c5a8f · 62c5a8f
1 parent 74790b3
commit 62c5a8f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cardinal/system/system_regen.go b/cardinal/system/system_regen.go
@@ -8,9 +8,12 @@ import (
 // RegenSystem replenishes the player's HP at every tick.
 // This provides an example of a system that doesn't rely on a transaction to update a component.
 func RegenSystem(world cardinal.WorldContext) error {
-	search := world.NewSearch(cardinal.Exact(comp.Player{}, comp.Health{}))
+	search, err := world.NewSearch(cardinal.Exact(comp.Player{}, comp.Health{}))
+	if err != nil {
+		return err
+	}
 
-	err := search.Each(world, func(id cardinal.EntityID) bool {
+	err = search.Each(world, func(id cardinal.EntityID) bool {
 		health, err := cardinal.GetComponent[comp.Health](world, id)
 		if err != nil {
 			return true

diff --git a/cardinal/system/utils.go b/cardinal/system/utils.go
@@ -8,11 +8,14 @@ import (
 
 // queryTargetPlayer queries for the target player's entity ID and health component.
 func queryTargetPlayer(world cardinal.WorldContext, targetNickname string) (cardinal.EntityID, *comp.Health, error) {
-	search := world.NewSearch(cardinal.Exact(comp.Player{}, comp.Health{}))
+	search, err := world.NewSearch(cardinal.Exact(comp.Player{}, comp.Health{}))
+	if err != nil {
+		return 0, nil, err
+	}
 
 	var playerID cardinal.EntityID
 	var playerHealth *comp.Health
-	err := search.Each(world, func(id cardinal.EntityID) bool {
+	err = search.Each(world, func(id cardinal.EntityID) bool {
 		player, err := cardinal.GetComponent[comp.Player](world, id)
 		if err != nil {
 			return false