From d8f1e8d569a827c4d5730b243ca2f4e7a66b1c88 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 9 Apr 2021 11:22:54 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc              |  1 +
 server/gameserver/room.cc               | 10 +++++-----
 server/tools/protobuild/metatable.proto |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 0d11c81..23a1bb3 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1048,6 +1048,7 @@ bool Human::CanUseSkill(int skill_id)
 void Human::DoJump()
 {
     if (HasBuffEffect(kBET_Fly)) {
+        a8::UnSetBitFlag(status, HS_DisableAttack);
         RemoveBuffByEffectId(kBET_Fly);
         MustBeAddBuff(this, kThroughWall_BUFFID);
         MustBeAddBuff(this, JUMP_BUFFID);
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index bef0f3d..20e2687 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2193,11 +2193,11 @@ void Room::NotifyGameStart()
          [] (const a8::XParams& param)
          {
              Room* room = (Room*)param.sender.GetUserData();
-             for (int buff_id : room->map_meta_->buff_list) {
-                 MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
-                 if (buff_meta) {
-                     for (auto& pair : room->human_hash_) {
-                         a8::UnSetBitFlag(pair.second->status, HS_DisableAttack);
+             for (auto& pair : room->human_hash_) {
+                 a8::UnSetBitFlag(pair.second->status, HS_DisableAttack);
+                 for (int buff_id : room->map_meta_->buff_list) {
+                     MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
+                     if (buff_meta) {
                          pair.second->AddBuff(pair.second,
                                               buff_meta,
                                               1,
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index cd0cd91..c25ec34 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -110,7 +110,7 @@ message Equip
     optional string param1 = 43;
     optional string param2 = 44;
     optional int32 reloadtype = 46;
-    optional float Recoil_force = 47;
+    optional float recoil_force = 47;
     optional int32 missiles_time = 48;
     optional int32 heroid = 49;