Add static in beinthandler.

7 files changed, 158 insertions, 156 deletions

diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 5b2495a1d..f6a35e870 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -43,8 +43,6 @@ class BeingHandler notfinal
         virtual void undress(Being *const being) const = 0;
 
         virtual void requestRanks(const Rank::Rank rank) const = 0;
-
-        virtual void viewPlayerEquipment(const Being *const being) = 0;
 };
 
 }  // namespace Net
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 9f3320dd0..da6ace767 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -44,14 +44,18 @@
 
 namespace Ea
 {
-BeingHandler::BeingHandler(const bool enableSync) :
-    mSync(enableSync),
-    mSpawnId(0),
-    mHideShield(config.getBoolValue("hideShield"))
+int BeingHandler::mSpawnId = 0;
+bool BeingHandler::mSync = false;
+bool BeingHandler::mHideShield = false;
+
+BeingHandler::BeingHandler(const bool enableSync)
 {
+    mSync = enableSync;
+    mSpawnId = 0;
+    mHideShield = config.getBoolValue("hideShield");
 }
 
-Being *BeingHandler::createBeing(const int id, const int16_t job) const
+Being *BeingHandler::createBeing(const int id, const int16_t job)
 {
     if (!actorManager)
         return nullptr;
@@ -74,14 +78,14 @@ void BeingHandler::setSprite(Being *const being, const unsigned int slot,
                              const int id, const std::string &color,
                              const unsigned char colorId,
                              const bool isWeapon,
-                             const bool isTempSprite) const
+                             const bool isTempSprite)
 {
     if (!being)
         return;
     being->updateSprite(slot, id, color, colorId, isWeapon, isTempSprite);
 }
 
-void BeingHandler::processBeingRemove(Net::MessageIn &msg) const
+void BeingHandler::processBeingRemove(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingRemove")
     if (!actorManager || !localPlayer)
@@ -132,7 +136,7 @@ void BeingHandler::processBeingRemove(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingRemove")
 }
 
-void BeingHandler::processSkillDamage(Net::MessageIn &msg) const
+void BeingHandler::processSkillDamage(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processSkillDamage")
     if (!actorManager)
@@ -160,7 +164,7 @@ void BeingHandler::processSkillDamage(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processSkillDamage")
 }
 
-void BeingHandler::processBeingAction(Net::MessageIn &msg) const
+void BeingHandler::processBeingAction(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingAction")
     if (!actorManager)
@@ -251,7 +255,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingAction")
 }
 
-void BeingHandler::processBeingEmotion(Net::MessageIn &msg) const
+void BeingHandler::processBeingEmotion(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingEmotion")
     if (!localPlayer || !actorManager)
@@ -281,7 +285,7 @@ void BeingHandler::processBeingEmotion(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingEmotion")
 }
 
-void BeingHandler::processNameResponse(Net::MessageIn &msg) const
+void BeingHandler::processNameResponse(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processNameResponse")
     if (!localPlayer || !actorManager)
@@ -342,7 +346,7 @@ void BeingHandler::processNameResponse(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processNameResponse")
 }
 
-void BeingHandler::processIpResponse(Net::MessageIn &msg) const
+void BeingHandler::processIpResponse(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processIpResponse")
     if (!actorManager)
@@ -357,7 +361,7 @@ void BeingHandler::processIpResponse(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processIpResponse")
 }
 
-void BeingHandler::processPlayerStop(Net::MessageIn &msg) const
+void BeingHandler::processPlayerStop(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerStop")
     if (!actorManager || !localPlayer)
@@ -387,7 +391,7 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerStop")
 }
 
-void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg) const
+void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerStop")
     msg.readInt32("target id");
@@ -402,7 +406,7 @@ void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerStop")
 }
 
-void BeingHandler::processSkillNoDamage(Net::MessageIn &msg) const
+void BeingHandler::processSkillNoDamage(Net::MessageIn &msg)
 {
     msg.readInt16("skill id");
     msg.readInt16("heal");
@@ -411,7 +415,7 @@ void BeingHandler::processSkillNoDamage(Net::MessageIn &msg) const
     msg.readUInt8("fail");
 }
 
-void BeingHandler::processPvpMapMode(Net::MessageIn &msg) const
+void BeingHandler::processPvpMapMode(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPvpMapMode")
     const Game *const game = Game::instance();
@@ -427,7 +431,7 @@ void BeingHandler::processPvpMapMode(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPvpMapMode")
 }
 
-void BeingHandler::processPvpSet(Net::MessageIn &msg) const
+void BeingHandler::processPvpSet(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPvpSet")
     const int id = msg.readInt32("being id");
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 957dc23d8..8513df916 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -36,42 +36,42 @@ class BeingHandler notfinal : public Net::BeingHandler
     protected:
         explicit BeingHandler(const bool enableSync);
 
-        Being *createBeing(const int id,
-                           const int16_t job) const A_WARN_UNUSED;
+        static Being *createBeing(const int id,
+                                  const int16_t job) A_WARN_UNUSED;
 
-        virtual void setSprite(Being *const being, const unsigned int slot,
-                               const int id,
-                               const std::string &color = "",
-                               const unsigned char colorId = 1,
-                               const bool isWeapon = false,
-                               const bool isTempSprite = false) const;
+        static void setSprite(Being *const being, const unsigned int slot,
+                              const int id,
+                              const std::string &color = "",
+                              const unsigned char colorId = 1,
+                              const bool isWeapon = false,
+                              const bool isTempSprite = false);
 
-        virtual void processBeingRemove(Net::MessageIn &msg) const;
+        static void processBeingRemove(Net::MessageIn &msg);
 
-        virtual void processSkillDamage(Net::MessageIn &msg) const;
+        static void processSkillDamage(Net::MessageIn &msg);
 
-        virtual void processBeingAction(Net::MessageIn &msg) const;
+        static void processBeingAction(Net::MessageIn &msg);
 
-        virtual void processBeingEmotion(Net::MessageIn &msg) const;
+        static void processBeingEmotion(Net::MessageIn &msg);
 
-        virtual void processNameResponse(Net::MessageIn &msg) const;
+        static void processNameResponse(Net::MessageIn &msg);
 
-        virtual void processIpResponse(Net::MessageIn &msg) const;
+        static void processIpResponse(Net::MessageIn &msg);
 
-        virtual void processPlayerStop(Net::MessageIn &msg) const;
+        static void processPlayerStop(Net::MessageIn &msg);
 
-        virtual void processPlayerMoveToAttack(Net::MessageIn &msg) const;
+        static void processPlayerMoveToAttack(Net::MessageIn &msg);
 
-        virtual void processSkillNoDamage(Net::MessageIn &msg) const;
+        static void processSkillNoDamage(Net::MessageIn &msg);
 
-        virtual void processPvpMapMode(Net::MessageIn &msg) const;
+        static void processPvpMapMode(Net::MessageIn &msg);
 
-        virtual void processPvpSet(Net::MessageIn &msg) const;
+        static void processPvpSet(Net::MessageIn &msg);
 
         // Should we honor server "Stop Walking" packets
-        bool mSync;
-        int mSpawnId;
-        bool mHideShield;
+        static int mSpawnId;
+        static bool mSync;
+        static bool mHideShield;
 };
 
 }  // namespace Ea
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index d0c3f1640..977e73942 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -324,7 +324,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
 
 Being *BeingHandler::createBeing2(const int id,
                                   const int16_t job,
-                                  const BeingType::BeingType beingType) const
+                                  const BeingType::BeingType beingType)
 {
     if (!actorManager)
         return nullptr;
@@ -393,7 +393,7 @@ void BeingHandler::requestRanks(const Rank::Rank rank) const
     outMsg.writeInt16(static_cast<int16_t>(rank), "type");
 }
 
-void BeingHandler::processBeingChangeLook(Net::MessageIn &msg) const
+void BeingHandler::processBeingChangeLook(Net::MessageIn &msg)
 {
     if (!actorManager)
         return;
@@ -411,7 +411,7 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg) const
     processBeingChangeLookContinue(dstBeing, type, id, id2);
 }
 
-void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg) const
+void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg)
 {
     if (!actorManager)
         return;
@@ -434,7 +434,7 @@ void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg) const
 void BeingHandler::processBeingChangeLookContinue(Being *const dstBeing,
                                                   const uint8_t type,
                                                   const int id,
-                                                  const int id2) const
+                                                  const int id2)
 {
     if (dstBeing->getType() == ActorType::Player)
         dstBeing->setOtherTime();
@@ -569,7 +569,7 @@ void BeingHandler::processNameResponse2(Net::MessageIn &msg)
     }
 }
 
-void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
+void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg)
 {
     if (!actorManager || !localPlayer)
         return;
@@ -601,7 +601,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
     {
         actorManager->undelete(dstBeing);
         if (serverVersion < 1)
-            requestNameById(id);
+            beingHandler->requestNameById(id);
     }
 
     uint8_t dir = dstBeing->getDirectionDelayed();
@@ -693,7 +693,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
         statusEffects & 0xffffU));
 }
 
-void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
+void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg)
 {
     if (!actorManager || !localPlayer)
         return;
@@ -725,7 +725,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
     {
         actorManager->undelete(dstBeing);
         if (serverVersion < 1)
-            requestNameById(id);
+            beingHandler->requestNameById(id);
     }
 
     uint8_t dir = dstBeing->getDirectionDelayed();
@@ -816,7 +816,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
         statusEffects & 0xffffU));
 }
 
-void BeingHandler::processPlayerMove(Net::MessageIn &msg) const
+void BeingHandler::processPlayerMove(Net::MessageIn &msg)
 {
     if (!actorManager || !localPlayer)
         return;
@@ -848,7 +848,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const
     {
         actorManager->undelete(dstBeing);
         if (serverVersion < 1)
-            requestNameById(id);
+            beingHandler->requestNameById(id);
     }
 
     const uint8_t dir = dstBeing->getDirectionDelayed();
@@ -1462,20 +1462,20 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg)
         statusEffects & 0xffffU));
 }
 
-void BeingHandler::processMapTypeProperty(Net::MessageIn &msg) const
+void BeingHandler::processMapTypeProperty(Net::MessageIn &msg)
 {
     msg.readInt16("type");
     // +++ need get pvp and other flags from here
     msg.readInt32("flags");
 }
 
-void BeingHandler::processMapType(Net::MessageIn &msg) const
+void BeingHandler::processMapType(Net::MessageIn &msg)
 {
     // battle ground map or not
     msg.readInt16("type");
 }
 
-void BeingHandler::processSkillCasting(Net::MessageIn &msg) const
+void BeingHandler::processSkillCasting(Net::MessageIn &msg)
 {
     msg.readInt32("src id");
     msg.readInt32("dst id");
@@ -1487,7 +1487,7 @@ void BeingHandler::processSkillCasting(Net::MessageIn &msg) const
     msg.readInt8("dispossable");
 }
 
-void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
+void BeingHandler::processBeingStatusChange(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingStatusChange")
     if (!actorManager)
@@ -1515,7 +1515,7 @@ void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingStatusChange")
 }
 
-void BeingHandler::processBeingMove2(Net::MessageIn &msg) const
+void BeingHandler::processBeingMove2(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingMove2")
     if (!actorManager)
@@ -1556,7 +1556,7 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingMove2")
 }
 
-void BeingHandler::processBeingAction2(Net::MessageIn &msg) const
+void BeingHandler::processBeingAction2(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingAction")
     if (!actorManager)
@@ -1651,7 +1651,7 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingAction")
 }
 
-void BeingHandler::processMonsterHp(Net::MessageIn &msg) const
+void BeingHandler::processMonsterHp(Net::MessageIn &msg)
 {
     Being *const dstBeing = actorManager->findBeing(
         msg.readInt32("monster id"));
@@ -1664,7 +1664,7 @@ void BeingHandler::processMonsterHp(Net::MessageIn &msg) const
     }
 }
 
-void BeingHandler::processSkillAutoCast(Net::MessageIn &msg) const
+void BeingHandler::processSkillAutoCast(Net::MessageIn &msg)
 {
     msg.readInt16("skill id");
     msg.readInt16("inf");
@@ -1676,7 +1676,7 @@ void BeingHandler::processSkillAutoCast(Net::MessageIn &msg) const
     msg.readInt8("unused");
 }
 
-void BeingHandler::processRanksList(Net::MessageIn &msg) const
+void BeingHandler::processRanksList(Net::MessageIn &msg)
 {
     // +++ here need window with rank tables.
     msg.readInt16("rank type");
@@ -1688,7 +1688,7 @@ void BeingHandler::processRanksList(Net::MessageIn &msg) const
     msg.readInt32("my points");
 }
 
-void BeingHandler::processBeingChangeDirection(Net::MessageIn &msg) const
+void BeingHandler::processBeingChangeDirection(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingChangeDirection")
     if (!actorManager)
@@ -1716,7 +1716,7 @@ void BeingHandler::processBeingChangeDirection(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingChangeDirection")
 }
 
-void BeingHandler::processBeingSpecialEffect(Net::MessageIn &msg) const
+void BeingHandler::processBeingSpecialEffect(Net::MessageIn &msg)
 {
     // +++ need somhow show this effects.
     // type is not same with self/misc effect.
@@ -1724,7 +1724,7 @@ void BeingHandler::processBeingSpecialEffect(Net::MessageIn &msg) const
     msg.readInt32("effect type");
 }
 
-void BeingHandler::processBeingSpecialEffectNum(Net::MessageIn &msg) const
+void BeingHandler::processBeingSpecialEffectNum(Net::MessageIn &msg)
 {
     // +++ need somhow show this effects.
     // type is not same with self/misc effect.
@@ -1733,7 +1733,7 @@ void BeingHandler::processBeingSpecialEffectNum(Net::MessageIn &msg) const
     msg.readInt32("num");  // effect variable
 }
 
-void BeingHandler::processBeingSoundEffect(Net::MessageIn &msg) const
+void BeingHandler::processBeingSoundEffect(Net::MessageIn &msg)
 {
     // +++ need play this effect.
     msg.readString(24, "sound effect name");
@@ -1798,7 +1798,7 @@ void BeingHandler::viewPlayerEquipment(const Being *const being)
     outMsg.writeInt32(being->getId(), "account id");
 }
 
-void BeingHandler::processSkillGroundNoDamage(Net::MessageIn &msg) const
+void BeingHandler::processSkillGroundNoDamage(Net::MessageIn &msg)
 {
     msg.readInt16("skill id");
     msg.readInt32("src id");
@@ -1808,7 +1808,7 @@ void BeingHandler::processSkillGroundNoDamage(Net::MessageIn &msg) const
     msg.readInt32("tick");
 }
 
-void BeingHandler::processSkillEntry(Net::MessageIn &msg) const
+void BeingHandler::processSkillEntry(Net::MessageIn &msg)
 {
     msg.readInt16("len");
     msg.readInt32("accound id");
@@ -1821,7 +1821,7 @@ void BeingHandler::processSkillEntry(Net::MessageIn &msg) const
     msg.readUInt8("level");
 }
 
-void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg) const
+void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerStop")
     if (!actorManager)
@@ -1849,7 +1849,7 @@ void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerStop")
 }
 
-void BeingHandler::processPlaterStatusChange2(Net::MessageIn &msg) const
+void BeingHandler::processPlaterStatusChange2(Net::MessageIn &msg)
 {
     if (!actorManager)
         return;
@@ -1869,7 +1869,7 @@ void BeingHandler::processPlaterStatusChange2(Net::MessageIn &msg) const
         statusEffects & 0xffff));
 }
 
-void BeingHandler::processPlaterStatusChangeNoTick(Net::MessageIn &msg) const
+void BeingHandler::processPlaterStatusChangeNoTick(Net::MessageIn &msg)
 {
     // +++ probably need show some effect?
     msg.readInt16("index");
@@ -1877,7 +1877,7 @@ void BeingHandler::processPlaterStatusChangeNoTick(Net::MessageIn &msg) const
     msg.readUInt8("state");
 }
 
-void BeingHandler::processBeingResurrect(Net::MessageIn &msg) const
+void BeingHandler::processBeingResurrect(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingResurrect")
     if (!actorManager || !localPlayer)
@@ -1905,7 +1905,7 @@ void BeingHandler::processBeingResurrect(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingResurrect")
 }
 
-void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg) const
+void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerGuilPartyInfo")
     if (!actorManager)
@@ -1935,13 +1935,13 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerGuilPartyInfo")
 }
 
-void BeingHandler::processBeingRemoveSkil(Net::MessageIn &msg) const
+void BeingHandler::processBeingRemoveSkil(Net::MessageIn &msg)
 {
     // +++ if skill unit was added, here need remove it from actors
     msg.readInt32("skill unit id");
 }
 
-void BeingHandler::processBeingFakeName(Net::MessageIn &msg) const
+void BeingHandler::processBeingFakeName(Net::MessageIn &msg)
 {
     const BeingType::BeingType type = static_cast<BeingType::BeingType>(
         msg.readUInt8("object type"));
@@ -1962,7 +1962,7 @@ void BeingHandler::processBeingFakeName(Net::MessageIn &msg) const
     dstBeing->setDirection(dir);
 }
 
-void BeingHandler::processBeingStatUpdate1(Net::MessageIn &msg) const
+void BeingHandler::processBeingStatUpdate1(Net::MessageIn &msg)
 {
     const int id = msg.readInt32("account id");
     const int type = msg.readInt16("type");
@@ -1980,7 +1980,7 @@ void BeingHandler::processBeingStatUpdate1(Net::MessageIn &msg) const
     dstBeing->setManner(value);
 }
 
-void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg) const
+void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingSelfEffect")
     if (!effectManager || !actorManager)
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index ed7b3586f..3719362c3 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -47,58 +47,58 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
         void requestRanks(const Rank::Rank rank) const override final;
 
     protected:
-        Being *createBeing2(const int id,
-                            const int16_t job,
-                            const BeingType::BeingType beingType) const;
+        static Being *createBeing2(const int id,
+                                   const int16_t job,
+                                   const BeingType::BeingType beingType);
 
-        void processBeingChangeLook(Net::MessageIn &msg) const;
+        static void processBeingChangeLook(Net::MessageIn &msg);
 
-        void processBeingChangeLook2(Net::MessageIn &msg) const;
+        static void processBeingChangeLook2(Net::MessageIn &msg);
 
-        void processBeingVisible(Net::MessageIn &msg);
+        static void processBeingVisible(Net::MessageIn &msg);
 
-        void processBeingMove(Net::MessageIn &msg);
+        static void processBeingMove(Net::MessageIn &msg);
 
-        void processBeingSpawn(Net::MessageIn &msg);
+        static void processBeingSpawn(Net::MessageIn &msg);
 
         static void processNameResponse2(Net::MessageIn &msg);
 
-        void processPlayerUpdate1(Net::MessageIn &msg) const;
+        static void processPlayerUpdate1(Net::MessageIn &msg);
 
-        void processPlayerUpdate2(Net::MessageIn &msg) const;
+        static void processPlayerUpdate2(Net::MessageIn &msg);
 
-        void processPlayerMove(Net::MessageIn &msg) const;
+        static void processPlayerMove(Net::MessageIn &msg);
 
-        void processMapTypeProperty(Net::MessageIn &msg) const;
+        static void processMapTypeProperty(Net::MessageIn &msg);
 
-        void processMapType(Net::MessageIn &msg) const;
+        static void processMapType(Net::MessageIn &msg);
 
-        void processSkillCasting(Net::MessageIn &msg) const;
+        static void processSkillCasting(Net::MessageIn &msg);
 
-        void processBeingStatusChange(Net::MessageIn &msg) const;
+        static void processBeingStatusChange(Net::MessageIn &msg);
 
-        void processBeingMove2(Net::MessageIn &msg) const;
+        static void processBeingMove2(Net::MessageIn &msg);
 
-        void processBeingAction2(Net::MessageIn &msg) const;
+        static void processBeingAction2(Net::MessageIn &msg);
 
-        void processMonsterHp(Net::MessageIn &msg) const;
+        static void processMonsterHp(Net::MessageIn &msg);
 
-        void processSkillAutoCast(Net::MessageIn &msg) const;
+        static void processSkillAutoCast(Net::MessageIn &msg);
 
-        void processRanksList(Net::MessageIn &msg) const;
+        static void processRanksList(Net::MessageIn &msg);
 
-        void processBeingChangeDirection(Net::MessageIn &msg) const;
+        static void processBeingChangeDirection(Net::MessageIn &msg);
 
-        void processBeingChangeLookContinue(Being *const dstBeing,
-                                            const uint8_t type,
-                                            const int id,
-                                            const int id2) const;
+        static void processBeingChangeLookContinue(Being *const dstBeing,
+                                                   const uint8_t type,
+                                                   const int id,
+                                                   const int id2);
 
-        void processBeingSpecialEffect(Net::MessageIn &msg) const;
+        static void processBeingSpecialEffect(Net::MessageIn &msg);
 
-        void processBeingSpecialEffectNum(Net::MessageIn &msg) const;
+        static void processBeingSpecialEffectNum(Net::MessageIn &msg);
 
-        void processBeingSoundEffect(Net::MessageIn &msg) const;
+        static void processBeingSoundEffect(Net::MessageIn &msg);
 
         static void setServerGender(Being *const being,
                                     const uint8_t gender);
@@ -106,29 +106,29 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
         static void applyPlayerAction(Being *const being,
                                       const uint8_t type);
 
-        void viewPlayerEquipment(const Being *const being) override final;
+        void viewPlayerEquipment(const Being *const being);
 
-        void processSkillGroundNoDamage(Net::MessageIn &msg) const;
+        static void processSkillGroundNoDamage(Net::MessageIn &msg);
 
-        void processSkillEntry(Net::MessageIn &msg) const;
+        static void processSkillEntry(Net::MessageIn &msg);
 
-        void processPlaterStatusChange(Net::MessageIn &msg) const;
+        static void processPlaterStatusChange(Net::MessageIn &msg);
 
-        void processPlaterStatusChangeNoTick(Net::MessageIn &msg) const;
+        static void processPlaterStatusChangeNoTick(Net::MessageIn &msg);
 
-        void processBeingResurrect(Net::MessageIn &msg) const;
+        static void processBeingResurrect(Net::MessageIn &msg);
 
-        void processPlayerGuilPartyInfo(Net::MessageIn &msg) const;
+        static void processPlayerGuilPartyInfo(Net::MessageIn &msg);
 
-        void processBeingRemoveSkil(Net::MessageIn &msg) const;
+        static void processBeingRemoveSkil(Net::MessageIn &msg);
 
-        void processBeingFakeName(Net::MessageIn &msg) const;
+        static void processBeingFakeName(Net::MessageIn &msg);
 
-        void processBeingStatUpdate1(Net::MessageIn &msg) const;
+        static void processBeingStatUpdate1(Net::MessageIn &msg);
 
-        void processPlaterStatusChange2(Net::MessageIn &msg) const;
+        static void processPlaterStatusChange2(Net::MessageIn &msg);
 
-        void processBeingSelfEffect(Net::MessageIn &msg) const;
+        static void processBeingSelfEffect(Net::MessageIn &msg);
 };
 
 }  // namespace EAthena
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 9ff7b3ad0..fb8a5d3fe 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -256,7 +256,7 @@ void BeingHandler::requestRanks(const Rank::Rank rank A_UNUSED) const
 {
 }
 
-void BeingHandler::processBeingChangeLook(Net::MessageIn &msg) const
+void BeingHandler::processBeingChangeLook(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingChangeLook")
     if (!actorManager)
@@ -281,7 +281,7 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingChangeLook")
 }
 
-void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg) const
+void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingChangeLook")
     if (!actorManager)
@@ -319,7 +319,7 @@ void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg) const
 void BeingHandler::processBeingChangeLookContinue(Being *const dstBeing,
                                                   const uint8_t type,
                                                   const int id,
-                                                  const int id2) const
+                                                  const int id2)
 {
     if (dstBeing->getType() == ActorType::Player)
         dstBeing->setOtherTime();
@@ -467,7 +467,7 @@ void BeingHandler::processNameResponse2(Net::MessageIn &msg)
     BLOCK_END("BeingHandler::processNameResponse2")
 }
 
-void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
+void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerMoveUpdate")
     if (!actorManager || !localPlayer)
@@ -509,7 +509,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
     {
         actorManager->undelete(dstBeing);
         if (serverVersion < 1)
-            requestNameById(id);
+            beingHandler->requestNameById(id);
     }
 
     uint8_t dir = dstBeing->getDirectionDelayed();
@@ -619,7 +619,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerMoveUpdate")
 }
 
-void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
+void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerMoveUpdate")
     if (!actorManager || !localPlayer)
@@ -661,7 +661,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
     {
         actorManager->undelete(dstBeing);
         if (serverVersion < 1)
-            requestNameById(id);
+            beingHandler->requestNameById(id);
     }
 
     uint8_t dir = dstBeing->getDirectionDelayed();
@@ -767,7 +767,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerMoveUpdate")
 }
 
-void BeingHandler::processPlayerMove(Net::MessageIn &msg) const
+void BeingHandler::processPlayerMove(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerMoveUpdate")
     if (!actorManager || !localPlayer)
@@ -809,7 +809,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const
     {
         actorManager->undelete(dstBeing);
         if (serverVersion < 1)
-            requestNameById(id);
+            beingHandler->requestNameById(id);
     }
 
     const uint8_t dir = dstBeing->getDirectionDelayed();
@@ -1063,7 +1063,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg)
         {
             actorManager->undelete(dstBeing);
             if (serverVersion < 1)
-                requestNameById(id);
+                beingHandler->requestNameById(id);
         }
     }
 
@@ -1273,7 +1273,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg)
         {
             actorManager->undelete(dstBeing);
             if (serverVersion < 1)
-                requestNameById(id);
+                beingHandler->requestNameById(id);
         }
     }
 
@@ -1410,7 +1410,7 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg)
     BLOCK_END("BeingHandler::processBeingSpawn")
 }
 
-void BeingHandler::processSkillCasting(Net::MessageIn &msg) const
+void BeingHandler::processSkillCasting(Net::MessageIn &msg)
 {
     msg.readInt32("src id");
     msg.readInt32("dst id");
@@ -1421,7 +1421,7 @@ void BeingHandler::processSkillCasting(Net::MessageIn &msg) const
     msg.readInt32("cast time");
 }
 
-void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
+void BeingHandler::processBeingStatusChange(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingStatusChange")
     if (!actorManager)
@@ -1441,7 +1441,7 @@ void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingStatusChange")
 }
 
-void BeingHandler::processBeingMove2(Net::MessageIn &msg) const
+void BeingHandler::processBeingMove2(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingMove2")
     if (!actorManager)
@@ -1481,7 +1481,7 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingMove2")
 }
 
-void BeingHandler::processBeingChangeDirection(Net::MessageIn &msg) const
+void BeingHandler::processBeingChangeDirection(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingChangeDirection")
     if (!actorManager)
@@ -1562,7 +1562,7 @@ void BeingHandler::viewPlayerEquipment(const Being *const being A_UNUSED)
 {
 }
 
-void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg) const
+void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerStop")
     if (!actorManager)
@@ -1590,7 +1590,7 @@ void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerStop")
 }
 
-void BeingHandler::processBeingResurrect(Net::MessageIn &msg) const
+void BeingHandler::processBeingResurrect(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingResurrect")
     if (!actorManager || !localPlayer)
@@ -1618,7 +1618,7 @@ void BeingHandler::processBeingResurrect(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processBeingResurrect")
 }
 
-void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg) const
+void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processPlayerGuilPartyInfo")
     if (!actorManager)
@@ -1647,7 +1647,7 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerGuilPartyInfo")
 }
 
-void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg) const
+void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg)
 {
     BLOCK_START("BeingHandler::processBeingSelfEffect")
     if (!effectManager || !actorManager)
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 9a5bc993b..0caaa9979 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -45,47 +45,47 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
         void requestRanks(const Rank::Rank rank A_UNUSED) const override final;
 
-        void viewPlayerEquipment(const Being *const being) override final;
-
     protected:
-        void processBeingChangeLook(Net::MessageIn &msg) const;
+        void viewPlayerEquipment(const Being *const being);
+
+        static void processBeingChangeLook(Net::MessageIn &msg);
 
-        void processBeingChangeLook2(Net::MessageIn &msg) const;
+        static void processBeingChangeLook2(Net::MessageIn &msg);
 
-        void processBeingVisible(Net::MessageIn &msg);
+        static void processBeingVisible(Net::MessageIn &msg);
 
-        void processBeingMove(Net::MessageIn &msg);
+        static void processBeingMove(Net::MessageIn &msg);
 
         static void processNameResponse2(Net::MessageIn &msg);
 
-        void processPlayerUpdate1(Net::MessageIn &msg) const;
+        static void processPlayerUpdate1(Net::MessageIn &msg);
 
-        void processPlayerUpdate2(Net::MessageIn &msg) const;
+        static void processPlayerUpdate2(Net::MessageIn &msg);
 
-        void processPlayerMove(Net::MessageIn &msg) const;
+        static void processPlayerMove(Net::MessageIn &msg);
 
         static void processBeingMove3(Net::MessageIn &msg);
 
-        void processBeingSpawn(Net::MessageIn &msg);
+        static void processBeingSpawn(Net::MessageIn &msg);
 
-        void processSkillCasting(Net::MessageIn &msg) const;
+        static void processSkillCasting(Net::MessageIn &msg);
 
-        void processBeingStatusChange(Net::MessageIn &msg) const;
+        static void processBeingStatusChange(Net::MessageIn &msg);
 
-        void processBeingMove2(Net::MessageIn &msg) const;
+        static void processBeingMove2(Net::MessageIn &msg);
 
-        void processBeingChangeDirection(Net::MessageIn &msg) const;
+        static void processBeingChangeDirection(Net::MessageIn &msg);
 
-        void processBeingChangeLookContinue(Being *const dstBeing,
-                                            const uint8_t type,
-                                            const int id,
-                                            const int id2) const;
+        static void processBeingChangeLookContinue(Being *const dstBeing,
+                                                   const uint8_t type,
+                                                   const int id,
+                                                   const int id2);
 
-        void processPlaterStatusChange(Net::MessageIn &msg) const;
+        static void processPlaterStatusChange(Net::MessageIn &msg);
 
-        void processBeingResurrect(Net::MessageIn &msg) const;
+        static void processBeingResurrect(Net::MessageIn &msg);
 
-        void processPlayerGuilPartyInfo(Net::MessageIn &msg) const;
+        static void processPlayerGuilPartyInfo(Net::MessageIn &msg);
 
         static void setServerGender(Being *const being,
                                     const uint8_t gender);
@@ -93,7 +93,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
         static void applyPlayerAction(Being *const being,
                                       const uint8_t type);
 
-        void processBeingSelfEffect(Net::MessageIn &msg) const;
+        static void processBeingSelfEffect(Net::MessageIn &msg);
 };
 
 }  // namespace TmwAthena