6 files changed, 96 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c759e944b..91c79c88d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1586,6 +1586,8 @@ SET(SRCS
     net/eathena/adminhandler.h
     net/eathena/attendancehandler.cpp
     net/eathena/attendancehandler.h
+    net/eathena/attendancerecv.cpp
+    net/eathena/attendancerecv.h
     net/eathena/auctionrecv.cpp
     net/eathena/auctionrecv.h
     net/eathena/auctionhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1900f2af4..ea67848a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1895,6 +1895,8 @@ SRC += gui/windows/bankwindow.cpp \
 	      net/eathena/adminhandler.h \
 	      net/eathena/attendancehandler.cpp \
 	      net/eathena/attendancehandler.h \
+	      net/eathena/attendancerecv.cpp \
+	      net/eathena/attendancerecv.h \
 	      net/eathena/auctionrecv.cpp \
 	      net/eathena/auctionrecv.h \
 	      net/eathena/auctionhandler.cpp \
diff --git a/src/net/eathena/attendancerecv.cpp b/src/net/eathena/attendancerecv.cpp
new file mode 100644
index 000000000..73c21ed3e
--- /dev/null
+++ b/src/net/eathena/attendancerecv.cpp
@@ -0,0 +1,39 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2018  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/attendancerecv.h"
+
+#include "logger.h"
+
+#include "net/messagein.h"
+
+#include "debug.h"
+
+namespace EAthena
+{
+
+void AttendanceRecv::processOpenWindow(Net::MessageIn &msg)
+{
+    UNIMPLEMENTEDPACKET;
+    msg.readInt8("window type");
+    msg.readInt32("data");
+}
+
+}  // namespace EAthena
diff --git a/src/net/eathena/attendancerecv.h b/src/net/eathena/attendancerecv.h
new file mode 100644
index 000000000..5c01bcd5a
--- /dev/null
+++ b/src/net/eathena/attendancerecv.h
@@ -0,0 +1,37 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2018  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_ATTENDANCERECV_H
+#define NET_EATHENA_ATTENDANCERECV_H
+
+namespace Net
+{
+    class MessageIn;
+}  // namespace Net
+
+namespace EAthena
+{
+    namespace AttendanceRecv
+    {
+        void processOpenWindow(Net::MessageIn &msg);
+    }  // namespace AttendanceRecv
+}  // namespace EAthena
+
+#endif  // NET_EATHENA_ATTENDANCERECV_H
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 375fdea54..e0336ae06 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -42,6 +42,7 @@
 
 #include "net/eathena/adminrecv.h"
 #include "net/eathena/auctionrecv.h"
+#include "net/eathena/attendancerecv.h"
 #include "net/eathena/bankrecv.h"
 #include "net/eathena/battlegroundrecv.h"
 #include "net/eathena/beingrecv.h"
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 4a5e3fbf3..74dd99152 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -1030,12 +1030,15 @@ if (packetVersion >= 20171207)
 }
 
 // re 20180221
-if (packets_re == true)
-{
-if (packetVersion >= 20180221)
+if (packetVersionRe >= 20180221)
 {
     packet(SMSG_SOLVE_CHAR_NAME,           0x0af7,  32, &BeingRecv::processSolveCharName,               20180221);
 }
+
+// re 20180221
+if (packetVersionRe >= 20180221)
+{
+    packet(SMSG_FRIENDS_PLAYER_ONLINE,     0x0206,  35, &FriendsRecv::processPlayerOnline,              20180221);
 }
 
 // main 20180307
@@ -1045,10 +1048,16 @@ if (packetVersionMain >= 20180307)
     packet(SMSG_FRIENDS_PLAYER_ONLINE,     0x0206,  35, &FriendsRecv::processPlayerOnline,              20180307);
 }
 
-// re 20180221
-if (packetVersionRe >= 20180221)
+// re 20180307
+if (packetVersionRe >= 20180307)
 {
-    packet(SMSG_FRIENDS_PLAYER_ONLINE,     0x0206,  35, &FriendsRecv::processPlayerOnline,              20180221);
+    packet(SMSG_OPEN_WINDOW2,              0x0ae2,   7, &AttendanceRecv::processOpenWindow,             20180307);
+}
+
+// main 20180404
+if (packetVersionMain >= 20180404)
+{
+    packet(SMSG_OPEN_WINDOW2,              0x0ae2,   7, &AttendanceRecv::processOpenWindow,             20180404);
 }
 
 // 0