Merge pull request #232 from mekolat/tilesv16.11.28

bug roundup

4 files changed, 9 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 53192da..2dca54f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v16.11.28
+  - revert v16.11.9
+  - force sending the .gat extension in SMSG_SET_TILES_TYPE
+v16.11.27
+  - implement SMSG_SET_TILES_TYPE
 v16.11.9
   - fix a bug that did not decrease the npc counter on npc despawn
 v16.5.12
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 57c9dcb..9518504 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -3930,6 +3930,8 @@ void clif_update_collision(dumb_ptr<map_session_data> sd, short x1, short y1,
 {
     nullpo_retv(sd);
 
+    VString<15> gat_name = STRPRINTF("%s.gat"_fmt, map_name);
+
     Packet_Fixed<0x0231> fixed_231;
     fixed_231.x1 = x1;
     fixed_231.y1 = y1;
@@ -3937,7 +3939,7 @@ void clif_update_collision(dumb_ptr<map_session_data> sd, short x1, short y1,
     fixed_231.y2 = y2;
     fixed_231.mask = mask;
     fixed_231.unused_layer = 0;
-    fixed_231.map = map_name;
+    fixed_231.map = gat_name;
     Buffer buf = create_fpacket<0x0231, 34>(fixed_231);
 
     clif_send(buf, sd, SendWho::SELF, wrap<ClientVersion>(7));
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 08d5ceb..e7b0da8 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -208,9 +208,6 @@ int map_delblock(dumb_ptr<block_list> bl)
         return 0;
     }
 
-    if (bl->bl_type == BL::NPC)
-        bl->bl_m->npc_num--;
-
     if (bl->bl_type == BL::PC)
         bl->bl_m->users--;
 
diff --git a/tools/protocol.py b/tools/protocol.py
index 7a5542a..1a87263 100755
--- a/tools/protocol.py
+++ b/tools/protocol.py
@@ -4806,7 +4806,7 @@ def build_context():
             at(8, u16, 'y2'),
             at(10, u32, 'mask'),
             at(14, u32, 'unused layer'),
-            at(18, map_name, 'map'),
+            at(18, str16, 'map'),
         ],
         fixed_size=34,
         pre=[NOTHING],