Merge branch 'master' into stable

1 files changed, 5 insertions, 4 deletions

diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 3e5db9169..de376cead 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -41,6 +41,7 @@
 
 #include "resources/db/deaddb.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "net/ea/eaprotocol.h"
@@ -60,9 +61,9 @@ namespace
     /**
      * Listener used for handling the overweigth message.
      */
-    struct WeightListener final : public gcn::ActionListener
+    struct WeightListener final : public ActionListener
     {
-        void action(const gcn::ActionEvent &event A_UNUSED)
+        void action(const ActionEvent &event A_UNUSED)
         {
             weightNotice = nullptr;
         }
@@ -71,9 +72,9 @@ namespace
     /**
      * Listener used for handling death message.
      */
-    struct DeathListener final : public gcn::ActionListener
+    struct DeathListener final : public ActionListener
     {
-        void action(const gcn::ActionEvent &event A_UNUSED)
+        void action(const ActionEvent &event A_UNUSED)
         {
             if (Net::getPlayerHandler())
                 Net::getPlayerHandler()->respawn();