diff options
| -rw-r--r-- | src/net/eathena/beingrecv.cpp | 13 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 52b1508da..3e9c935dc 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -304,11 +304,8 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg) // Information about a being in range const BeingId id = msg.readBeingId("being id"); - if (msg.getVersion() >= 20131223 && - (serverVersion == 0 || serverVersion >= 11)) - { + if (msg.getVersion() >= 20131223) msg.readBeingId("char id"); - } BeingId spawnId; if (id == Ea::BeingRecv::mSpawnId) spawnId = Ea::BeingRecv::mSpawnId; @@ -543,11 +540,8 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg) // Information about a being in range const BeingId id = msg.readBeingId("being id"); - if (msg.getVersion() >= 20131223 && - (serverVersion == 0 || serverVersion >= 11)) - { + if (msg.getVersion() >= 20131223) msg.readBeingId("char id"); - } BeingId spawnId; if (id == Ea::BeingRecv::mSpawnId) spawnId = Ea::BeingRecv::mSpawnId; @@ -779,8 +773,7 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg) // Information about a being in range const BeingId id = msg.readBeingId("being id"); - if (msg.getVersion() >= 20131223 && - (serverVersion == 0 || serverVersion >= 11)) + if (msg.getVersion() >= 20131223) { msg.readBeingId("char id"); } diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 415384156..818fffde9 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -459,8 +459,6 @@ void PlayerHandler::shortcutShiftRow(const int row) const { if (packetVersion < 20140129) return; - if (serverVersion != 0 && serverVersion < 11) - return; createOutPacket(CMSG_SHORTCUTS_ROW_SHIFT); outMsg.writeInt8(CAST_S8(row), "row"); } |