From 047b93a50ef0235d46613d1b3520ed443192455e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 10 Apr 2019 15:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=AF=92=E5=9C=88=E6=97=A0=E4=BC=A4=E5=AE=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/player.cc | 2 +-
 server/gameserver/room.cc   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 0fbe070..df87734 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -195,7 +195,7 @@ void Player::UpdateAction()
                         if (item_meta){
                             if (inventory[item_meta->i->_inventory_slot()] > 0) {
                                 health += item_meta->i->heal();
-                                health = std::max(100.0f, health);
+                                health = std::min(100.0f, health);
                                 --inventory[item_meta->i->_inventory_slot()];
                                 need_sync_active_player = true;
                                 SyncAroundPlayers();
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 45836b7..23c429b 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -630,7 +630,11 @@ void Room::UpdateGas()
                 continue;
             }
             bool b1 = CircleContainCircle(gas_data.pos_old,
+                                          #if 1
+                                          gas_data.gas_progress,
+                                          #else
                                           gas_data.rad_old,
+                                          #endif
                                           pair.second->pos,
                                           pair.second->GetRadius()
                                           );