Merge pull request #218 from chililisoup/main

Block swap fixes for compat, networking, sounds

1 files changed, 9 insertions, 3 deletions

diff --git a/source/game/StarNetPackets.cpp b/source/game/StarNetPackets.cpp
index 0b9f6a3..953743c 100644
--- a/source/game/StarNetPackets.cpp
+++ b/source/game/StarNetPackets.cpp
@@ -756,19 +756,25 @@ void ModifyTileListPacket::write(DataStream& ds) const {
   ds.write(allowEntityOverlap);
 }
 
-ReplaceTileListPacket::ReplaceTileListPacket() {}
+ReplaceTileListPacket::ReplaceTileListPacket() : applyDamage() {}
 
-ReplaceTileListPacket::ReplaceTileListPacket(TileModificationList modifications, TileDamage tileDamage)
-  : modifications(modifications), tileDamage(std::move(tileDamage)) {}
+ReplaceTileListPacket::ReplaceTileListPacket(TileModificationList modifications, TileDamage tileDamage, bool applyDamage)
+  : modifications(modifications), tileDamage(std::move(tileDamage)), applyDamage(applyDamage) {}
 
 void ReplaceTileListPacket::read(DataStream& ds) {
   ds.readContainer(modifications);
   ds.read(tileDamage);
+  if (ds.streamCompatibilityVersion() >= 7)
+    ds.read(applyDamage);
+  else
+    applyDamage = false;
 }
 
 void ReplaceTileListPacket::write(DataStream& ds) const {
   ds.writeContainer(modifications);
   ds.write(tileDamage);
+  if (ds.streamCompatibilityVersion() >= 7)
+    ds.write(applyDamage);
 }
 
 DamageTileGroupPacket::DamageTileGroupPacket() : layer(TileLayer::Foreground) {}