Merge branch 'master' into Playerbot

src/server/apps/authserver/Server/AuthSocketMgr.h

@@ -19,8 +19,8 @@
 #define AuthSocketMgr_h__
 
 #include "AuthSession.h"
-#include "SocketMgr.h"
 #include "Config.h"
+#include "SocketMgr.h"
 
 class AuthSocketMgr : public SocketMgr<AuthSession>
 {

src/server/apps/worldserver/worldserver.conf.dist

@@ -4335,6 +4335,13 @@ PlayerDump.DisallowOverwrite = 1
 ICC.Buff.Horde    = 73822
 ICC.Buff.Alliance = 73828
 
+#
+#    WipeGunshipBlizzlike.Enable
+#       Description: Wipe the gunship fight if no player is on the deck.
+#       Default:     1 - (Blizzlike)
+
+WipeGunshipBlizzlike.Enable = 1
+
 #
 #     Minigob.Manabonk.Enable
 #        Description: Enable/ Disable Minigob Manabonk