Refactor expedition logging

src/main/java/server/expeditions/Expedition.java

@@ -32,6 +32,8 @@ import net.server.audit.locks.MonitoredLockType;
 import net.server.audit.locks.MonitoredReentrantLock;
 import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
 import net.server.channel.Channel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import server.TimerManager;
 import server.life.Monster;
 import server.maps.MapleMap;
@@ -51,6 +53,7 @@ import static java.util.concurrent.TimeUnit.MINUTES;
  * @author Alan (SharpAceX)
  */
 public class Expedition {
+    private static final Logger log = LoggerFactory.getLogger(Expedition.class);
 
     private static final int[] EXPEDITION_BOSSES = {
             MobId.ZAKUM_1,
@@ -151,10 +154,29 @@ public class Expedition {
             schedule.cancel(false);
         }
         if (log && !registering) {
-            LogHelper.logExpedition(this);
+            log();
         }
     }
 
+    private void log() {
+        final String gmMessage = type + " Expedition with leader " + leader.getName() + " finished after " + LogHelper.getTimeString(getStartTime());
+        Server.getInstance().broadcastGMMessage(getLeader().getWorld(), PacketCreator.serverNotice(6, gmMessage));
+
+        String log = type + " EXPEDITION\r\n";
+        log += LogHelper.getTimeString(startTime) + "\r\n";
+
+        for (String memberName : getMembers().values()) {
+            log += ">>" + memberName + "\r\n";
+        }
+        log += "BOSS KILLS\r\n";
+        for (String message : bossLogs) {
+            log += message;
+        }
+        log += "\r\n";
+
+        Expedition.log.info(log);
+    }
+
     public void finishRegistration() {
         registering = false;
     }