From cafa218850d49dd83dd0f3c510dc5891dbb0ac4a Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 26 Oct 2020 20:17:46 -0500
Subject: [PATCH] Addressed comments.

---
 common/src/comp/buff.rs  | 15 ++++++---------
 common/src/comp/stats.rs |  4 +++-
 common/src/sys/buff.rs   |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs
index 4e144c2df2..08a489baf3 100644
--- a/common/src/comp/buff.rs
+++ b/common/src/comp/buff.rs
@@ -5,16 +5,14 @@ use specs_idvs::IdvStorage;
 use std::{cmp::Ordering, collections::HashMap, time::Duration};
 
 /// De/buff Kind.
-/// This is used to determine what effects a buff will have, as well as
-/// determine the strength and duration of the buff effects using the internal
-/// values
+/// This is used to determine what effects a buff will have
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Serialize, Deserialize)]
 pub enum BuffKind {
     /// Restores health/time for some period
     Regeneration,
     /// Lowers health over time for some duration
     Bleeding,
-    /// Prefixes an entity's name with "Cursed"
+    /// Lower a creature's max health
     /// Currently placeholder buff to show other stuff is possible
     Cursed,
 }
@@ -151,7 +149,9 @@ impl Buff {
 
 impl PartialOrd for Buff {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        if self.data.strength > other.data.strength {
+        if self == other {
+            Some(Ordering::Equal)
+        } else if self.data.strength > other.data.strength {
             Some(Ordering::Greater)
         } else if self.data.strength < other.data.strength {
             Some(Ordering::Less)
@@ -159,8 +159,6 @@ impl PartialOrd for Buff {
             Some(Ordering::Greater)
         } else if compare_duration(other.time, self.time) {
             Some(Ordering::Less)
-        } else if self == other {
-            Some(Ordering::Equal)
         } else {
             None
         }
@@ -173,7 +171,7 @@ fn compare_duration(a: Option<Duration>, b: Option<Duration>) -> bool {
 
 impl PartialEq for Buff {
     fn eq(&self, other: &Self) -> bool {
-        self.data.strength == other.data.strength || self.time == other.time
+        self.data.strength == other.data.strength && self.time == other.time
     }
 }
 
@@ -236,7 +234,6 @@ impl Buffs {
             }
             self.kinds.remove(&kind);
         }
-        self.sort_kind(kind);
     }
 
     pub fn force_insert(&mut self, id: BuffId, buff: Buff) -> BuffId {
diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs
index 3be36dd33e..7289bfbdf7 100644
--- a/common/src/comp/stats.rs
+++ b/common/src/comp/stats.rs
@@ -70,7 +70,9 @@ impl Health {
         self.last_change = (0.0, change);
     }
 
-    // This is private because max hp is based on the level
+    // This function changes the modified max health value, not the base health
+    // value. The modified health value takes into account buffs and other temporary
+    // changes to max health.
     pub fn set_maximum(&mut self, amount: u32) {
         self.maximum = amount;
         self.current = self.current.min(self.maximum);
diff --git a/common/src/sys/buff.rs b/common/src/sys/buff.rs
index ee3dbcdb93..3cff89f8fc 100644
--- a/common/src/sys/buff.rs
+++ b/common/src/sys/buff.rs
@@ -30,6 +30,7 @@ impl<'a> System<'a> for Sys {
         let mut server_emitter = server_bus.emitter();
         // Set to false to avoid spamming server
         buffs.set_event_emission(false);
+        stats.set_event_emission(false);
         for (entity, buff_comp, uid, stat) in (&entities, &mut buffs, &uids, &mut stats).join() {
             let mut expired_buffs = Vec::<BuffId>::new();
             for (id, buff) in buff_comp.buffs.iter_mut() {
@@ -138,6 +139,8 @@ impl<'a> System<'a> for Sys {
                 });
             }
         }
+        // Turned back to true
         buffs.set_event_emission(true);
+        stats.set_event_emission(true);
     }
 }