From 7d6a3d15e8d57de473b1a92b46460e2c7d000994 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 19 Jul 2019 10:38:07 +0800
Subject: [PATCH] 1

---
 server/gameserver/hero.cc      | 1 -
 server/gameserver/hero.h       | 1 -
 server/gameserver/human.cc     | 8 +++-----
 server/gameserver/human.h      | 4 ----
 server/gameserver/player.cc    | 1 -
 server/gameserver/playermgr.cc | 1 -
 server/gameserver/room.cc      | 1 -
 7 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index aff4046..ac80616 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -54,5 +54,4 @@ void Hero::FillMFObjectFull(cs::MFObjectFull* full_data)
     p->set_helmet(helmet);
     p->set_chest(chest);
     weapon.ToPB(p->mutable_weapon());
-    p->set_energy_shield(energy_shield);
 }
diff --git a/server/gameserver/hero.h b/server/gameserver/hero.h
index 406fcec..78f4225 100644
--- a/server/gameserver/hero.h
+++ b/server/gameserver/hero.h
@@ -20,7 +20,6 @@ class Hero : public Entity
     int helmet = 0;
     int chest = 0;
     Weapon weapon;
-    int energy_shield = 0;
 
     Hero();
     virtual ~Hero() override;
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index faff3db..6543ef8 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -130,8 +130,8 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
     p->set_helmet(helmet);
     p->set_chest(chest);
     curr_weapon->ToPB(p->mutable_weapon());
+    #if 0
     p->set_energy_shield(energy_shield);
-    #if 1
     {
         p->set_max_energy_shield(max_energy_shield);
     }
@@ -509,9 +509,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
 
 void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id)
 {
-    if (energy_shield > 0.001f) {
-        energy_shield = std::max(0.0f, energy_shield - dec_hp);
-    } else {
+    {
         float old_health = GetHP();
         ability.hp = std::max(0.0f, GetHP() - dec_hp);
         if (GetHP() - old_health > 0.001f) {
@@ -752,8 +750,8 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
     for (auto& num : inventory_) {
         player_data->add_inventory(num);
     }
+    #if 0
     player_data->set_energy_shield(energy_shield);
-    #if 1
     {
         player_data->set_max_energy_shield(max_energy_shield);
     }
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index f9d5e64..a8d9658 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -58,8 +58,6 @@ class Human : public Entity
     std::string avatar_url;
     bool dead = false;
     bool disconnected = false;
-    int anim_type = 0;
-    int anim_seq = 0;
     ActionType_e action_type = AT_None;
     long long action_frameno = 0;
     int action_duration = 0;
@@ -70,8 +68,6 @@ class Human : public Entity
     int backpack = 0;
     int helmet = 0;
     int chest = 0;
-    int energy_shield = 0;
-    int max_energy_shield = 0;
     int vip = 0;
     int sdmg = 0;
     int lethal_weapon = 0;
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index ab8771f..d9de5a2 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -30,7 +30,6 @@ Player::~Player()
 void Player::Initialize()
 {
     Human::Initialize();
-    max_energy_shield = energy_shield;
     skin_meta = MetaMgr::Instance()->GetTank(SkinId());
     if (skin_meta) {
         skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());
diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc
index 98c7b8b..d70da1e 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -50,7 +50,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
     hum->auto_fill = msg.auto_fill();
     hum->use_touch = msg.use_touch();
     hum->avatar_url = msg.avatar_url();
-    hum->energy_shield = msg.energy_shield();
     hum->create_tick = a8::XGetTickCount();
     hum->account_registertime = f8::ExtractRegisterTimeFromSessionId(msg.session_id());
     for (auto& weapon : msg.weapons()) {
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 1fac101..70703ab 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -505,7 +505,6 @@ Hero* Room::CreateHero(Human* hum)
     hero->helmet = hum->helmet;
     hero->chest = hum->chest;
     hero->weapon = *hum->curr_weapon;
-    hero->energy_shield = hum->energy_shield;
     hero->Initialize();
     #if 1
     uniid_hash_[hero->entity_uniid] = hero;