1 files changed, 6 insertions, 0 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 0a84561..a4b736b 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -50,6 +50,10 @@ Transmission::map_t Server::calculateUpdates()
       case Actor::None: break;
       default: Q_ASSERT(false);
     }
+    if (newMapPosition.x() < 0) newMapPosition.setX(0);
+    if (newMapPosition.x() >= visualMap.size()) newMapPosition.setX(visualMap.size()-1);
+    if (newMapPosition.y() < 0) newMapPosition.setY(0);
+    if (newMapPosition.y() >= visualMap[newMapPosition.x()].size()) newMapPosition.setY(visualMap[newMapPosition.x()].size()-1);
 
     // <t3h g4m3 10gic>
     if (0 <= newMapPosition.x() && newMapPosition.x() < visualMap.size() &&
@@ -60,10 +64,12 @@ Transmission::map_t Server::calculateUpdates()
     }
     // </t3h g4m2 10gic>
 
+    if (mapPosition != newMapPosition) {
     map[mapPosition.x()][mapPosition.y()] = Transmission::empty;
     map[newMapPosition.x()][newMapPosition.y()] =
               Transmission::pacman | i.key() |
               Util::actorMovementToTransmission(i.value()) ;
+    }
   }
   return map;
 }