diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc
index 1a037cf0..0c8fe25c 100644
--- a/server/gameserver/hero_agent.cc
+++ b/server/gameserver/hero_agent.cc
@@ -1342,7 +1342,7 @@ int HeroAgent::SearchPickupObj()
              }
          });
     if (nearest_obj &&
-        nearest_obj->GetPos().ManhattanDistance2D(owner_->GetPos()) < 600) {
+        nearest_obj->GetPos().ManhattanDistance2D(owner_->GetPos()) < 300) {
         int obj_type = 0;
         if (nearest_obj->IsCar()) {
             obj_type = 1;
@@ -1466,6 +1466,9 @@ bool HeroAgent::CanThrowItem(int slot)
     if (owner_->IsCar()) {
         return false;
     }
+    if (owner_->GetCar()) {
+        return false;
+    }
     if (owner_->room->GetFrameNo() - last_throw_item_frameno_ < SERVER_FRAME_RATE * 5) {
         return false;
     }