summaryrefslogtreecommitdiff
path: root/src/net/beinghandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/beinghandler.cpp')
-rw-r--r--src/net/beinghandler.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 0873764e..4d25b7d1 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -228,8 +228,21 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
const float tilesPerSecond = 100.0f / speed;
being->setWalkSpeed((int) (tilesPerSecond * 32));
}
+
+ // Ignore messages from the server for the local player
+ if (being == player_node)
+ break;
+
+ // If being is a player, and he only moves a little, its ok to be a little out of sync
+ if (being->getType() == Being::PLAYER && abs(being->getPixelX() - dx) +
+ abs(being->getPixelY() - dy) < 2 * 32 &&
+ (dx != being->getDestination().x && dy != being->getDestination().y))
+ {
+ being->setDestination(being->getPixelX(),being->getPixelY());
+ break;
+ }
if (abs(being->getPixelX() - sx) +
- abs(being->getPixelY() - sy) > 4 * 32)
+ abs(being->getPixelY() - sy) > 10 * 32)
{
// Too large a desynchronization.
being->setPosition(sx, sy);