diff --git a/server/gameserver/dummyentity.cc b/server/gameserver/dummyentity.cc
index e29f5e8..a4be227 100644
--- a/server/gameserver/dummyentity.cc
+++ b/server/gameserver/dummyentity.cc
@@ -14,6 +14,19 @@ void DummyEntity::Initialize()
         for (auto& obj : *blocks) {
             switch (obj.shape()) {
             case 1:
+                {
+                    CircleCollider* collider = new CircleCollider();
+                    collider->owner = this;
+                    collider->pos = a8::Vec2(obj.x(), obj.y());
+                    collider->rad = obj.rad();
+                    if (obj.bullet_penetrate()) {
+                        a8::SetBitFlag(collider->tag, kHalfWallTag);
+                    }
+                    AddEntityCollider(collider);
+                    permanent_map_service->AddCollider(collider);
+                }
+                break;
+            case 2:
                 {
                     AabbCollider* collider = new AabbCollider();
                     collider->owner = this;
@@ -29,19 +42,6 @@ void DummyEntity::Initialize()
                     permanent_map_service->AddCollider(collider);
                }
                 break;
-            case 2:
-                {
-                    CircleCollider* collider = new CircleCollider();
-                    collider->owner = this;
-                    collider->pos = a8::Vec2(obj.x(), obj.y());
-                    collider->rad = obj.rad();
-                    if (obj.bullet_penetrate()) {
-                        a8::SetBitFlag(collider->tag, kHalfWallTag);
-                    }
-                    AddEntityCollider(collider);
-                    permanent_map_service->AddCollider(collider);
-                }
-                break;
             default:
                 {
                 }
diff --git a/server/gameserver/mapblock.cc b/server/gameserver/mapblock.cc
index 73d24c5..90ae1a9 100644
--- a/server/gameserver/mapblock.cc
+++ b/server/gameserver/mapblock.cc
@@ -70,11 +70,11 @@ void MapBlock::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
         cs::MFCollider* collider = full_data->mutable_union_obj_2()->mutable_collider();
         collider->set_shape(shape);
         if (shape == 1) {
-            collider->set_width(width);
-            collider->set_height(height);
-        } else {
             collider->set_width(rad);
             collider->set_height(rad);
+        } else {
+            collider->set_width(width);
+            collider->set_height(height);
         }
     }
 }