diff --git a/entities/data/entity_class_data.h b/entities/data/entity_class_data.h
index ecde212..a6d1a9e 100644
--- a/entities/data/entity_class_data.h
+++ b/entities/data/entity_class_data.h
@@ -242,7 +242,7 @@ private:
 
 	Ref<StatData> _stat_data;
 
-	Vector<Ref<EntityResource> > _entity_resources;
+	Vector<Ref<EntityResourceData> > _entity_resources;
 	Vector<Ref<CharacterSpec> > _specs;
 	Vector<Ref<Spell> > _spells;
 	Vector<Ref<Spell> > _start_spells;
diff --git a/entities/entity.cpp b/entities/entity.cpp
index 98e56db..7055105 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -4749,7 +4749,8 @@ void Entity::update(float delta) {
 
 			ERR_CONTINUE(!res.is_valid());
 
-			res->process_server(delta);
+			if (res->get_should_process())
+				res->process_server(delta);
 		}
 	}
 
@@ -4763,7 +4764,8 @@ void Entity::update(float delta) {
 
 			ERR_CONTINUE(!res.is_valid());
 
-			res->process_client(delta);
+			if (res->get_should_process())
+				res->process_client(delta);
 		}
 	}
 }