diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 0a08978..ff0ccbc 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -41,7 +41,9 @@ void InternalShot(Creature* c,
             return;
         }
     }
-    c->room->frame_event.AddShot(c);
+    if (skill_id == 0) {
+        c->room->frame_event.AddShot(c);
+    }
     for (auto& tuple : weapon_meta->bullet_born_offset) {
         a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple));
         bullet_born_offset.Rotate(c->attack_dir.CalcAngle(a8::Vec2::UP));
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 01210fc..75b5927 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2195,6 +2195,7 @@ void Room::NotifyGameStart()
                                               buff_meta,
                                               1,
                                               nullptr);
+                         #endif
                      }
                  }
              }
diff --git a/third_party/a8engine b/third_party/a8engine
index 2b5f0d3..8b64108 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 2b5f0d3b41e764d61181089b95c4fa568b1e1942
+Subproject commit 8b6410826da2c0c667abdacadae6d7c00f70300d