6 files changed, 5 insertions, 17 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 13cbeb286..114e2acd5 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -297,8 +297,12 @@ Being *ActorManager::createBeing(const BeingId id,
                 localPlayer->checkNewName(being);
             break;
         case ActorType::Monster:
-            if (serverFeatures && serverFeatures->haveMonsterName())
+#ifdef TMWA_SUPPORT
+            if (Net::getNetworkType() == ServerType::EATHENA)
+#endif  // TMWA_SUPPORT
+            {
                 beingHandler->requestNameById(id);
+            }
             break;
         case ActorType::Portal:
             if (beingHandler &&
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 6bf1536fd..edf86f09f 100644
--- a/src/net/eathena/serverfeatures.cpp
+++ b/src/net/eathena/serverfeatures.cpp
@@ -101,11 +101,6 @@ bool ServerFeatures::haveCharRename() const
     return true;
 }
 
-bool ServerFeatures::haveMonsterName() const
-{
-    return true;
-}
-
 bool ServerFeatures::haveBankApi() const
 {
     return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index df603863d..a8394b2e6 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -52,8 +52,6 @@ class ServerFeatures final : public Net::ServerFeatures
 
         bool haveMonsterAttackRange() const override final A_CONST;
 
-        bool haveMonsterName() const override final A_CONST;
-
         bool haveEmailOnRegister() const override final;
 
         bool haveEmailOnDelete() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index f211e3ea9..ed66e1b63 100644
--- a/src/net/serverfeatures.h
+++ b/src/net/serverfeatures.h
@@ -54,8 +54,6 @@ class ServerFeatures notfinal
 
         virtual bool haveMonsterAttackRange() const = 0;
 
-        virtual bool haveMonsterName() const = 0;
-
         virtual bool haveEmailOnRegister() const = 0;
 
         virtual bool haveEmailOnDelete() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index d0221d383..86ea22075 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -99,11 +99,6 @@ bool ServerFeatures::haveCharRename() const
     return false;
 }
 
-bool ServerFeatures::haveMonsterName() const
-{
-    return false;
-}
-
 bool ServerFeatures::haveBankApi() const
 {
     return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 1e91d6831..562a39c9e 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -52,8 +52,6 @@ class ServerFeatures final : public Net::ServerFeatures
 
         bool haveMonsterAttackRange() const override final;
 
-        bool haveMonsterName() const override final A_CONST;
-
         bool haveEmailOnRegister() const override final A_CONST;
 
         bool haveEmailOnDelete() const override final A_CONST;