summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-03-20 22:14:01 +0300
committerAndrei Karas <akaras@inbox.ru>2019-03-21 01:36:40 +0300
commit0e3549dd92ac1eac1916b3f5110036ab59fe2fec (patch)
tree85011f9be2576f4daeaae9513be24d50a5dae93a /src/net/ea
parentbd6ced98dfbe93fce5c143cdcd6fa6e8c3f4f6a8 (diff)
downloadplus-0e3549dd92ac1eac1916b3f5110036ab59fe2fec.tar.gz
plus-0e3549dd92ac1eac1916b3f5110036ab59fe2fec.tar.bz2
plus-0e3549dd92ac1eac1916b3f5110036ab59fe2fec.tar.xz
plus-0e3549dd92ac1eac1916b3f5110036ab59fe2fec.zip
Possible fix for desync in moving
Handle player stop packet always. Check desync always if tile changed client side. Check desync always if server move response packet received. Removed unused configuration option.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/beinghandler.cpp3
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/ea/beingrecv.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 2870bc85b..511154fd5 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -29,10 +29,9 @@
namespace Ea
{
-BeingHandler::BeingHandler(const bool enableSync) :
+BeingHandler::BeingHandler() :
Net::BeingHandler()
{
- BeingRecv::mSync = enableSync;
BeingRecv::mSpawnId = BeingId_zero;
}
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index a151601bc..8c90dbf01 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -34,7 +34,7 @@ class BeingHandler notfinal : public Net::BeingHandler
A_DELETE_COPY(BeingHandler)
protected:
- explicit BeingHandler(const bool enableSync);
+ explicit BeingHandler();
};
} // namespace Ea
diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp
index 4ac1f90eb..ed6e031b6 100644
--- a/src/net/ea/beingrecv.cpp
+++ b/src/net/ea/beingrecv.cpp
@@ -54,7 +54,6 @@ namespace Ea
namespace BeingRecv
{
- bool mSync = false;
BeingId mSpawnId = BeingId_zero;
} // namespace BeingRecv
@@ -345,7 +344,7 @@ void BeingRecv::processPlayerStop(Net::MessageIn &msg)
const BeingId id = msg.readBeingId("account id");
- if (mSync || id != localPlayer->getId())
+// if (mSync || id != localPlayer->getId())
{
Being *const dstBeing = actorManager->findBeing(id);
if (dstBeing != nullptr)