From 76f21c3487e41cb92fc7c8ef2cc3a826b4961d30 Mon Sep 17 00:00:00 2001
From: Jerom van der Sar <jerom.sar@hotmail.com>
Date: Sun, 15 Jun 2014 16:40:09 +0200
Subject: [PATCH] Only remove from TelnetLogAppender if the socket is truely
 closed. Resolves #3 Small changes.

---
 src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java        | 2 +-
 src/me/StevenLawson/BukkitTelnet/SocketListener.java      | 8 ++------
 src/me/StevenLawson/BukkitTelnet/TelnetLogAppender.java   | 2 --
 .../StevenLawson/BukkitTelnet/session/ClientSession.java  | 3 ---
 src/me/StevenLawson/BukkitTelnet/session/FilterMode.java  | 4 +++-
 .../BukkitTelnet/session/SessionCommandSender.java        | 2 +-
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java b/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java
index a2ee283..d27b9bc 100644
--- a/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java
+++ b/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java
@@ -38,6 +38,6 @@ public class BukkitTelnet extends JavaPlugin
     {
         TelnetServer.getInstance().stopServer();
 
-        TelnetLogger.info("Plugin disabled.");
+        TelnetLogger.info(plugin.getName() + " disabled.");
     }
 }
diff --git a/src/me/StevenLawson/BukkitTelnet/SocketListener.java b/src/me/StevenLawson/BukkitTelnet/SocketListener.java
index ab34fae..48e7472 100644
--- a/src/me/StevenLawson/BukkitTelnet/SocketListener.java
+++ b/src/me/StevenLawson/BukkitTelnet/SocketListener.java
@@ -5,11 +5,8 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class SocketListener extends Thread
 {
@@ -53,11 +50,10 @@ public class SocketListener extends Thread
         while (it.hasNext())
         {
             final ClientSession session = it.next();
-
-            TelnetLogAppender.getInstance().removeSession(session);
-
+            
             if (!session.syncIsConnected())
             {
+                TelnetLogAppender.getInstance().removeSession(session);
                 it.remove();
             }
         }
diff --git a/src/me/StevenLawson/BukkitTelnet/TelnetLogAppender.java b/src/me/StevenLawson/BukkitTelnet/TelnetLogAppender.java
index acda8c2..40a8a86 100644
--- a/src/me/StevenLawson/BukkitTelnet/TelnetLogAppender.java
+++ b/src/me/StevenLawson/BukkitTelnet/TelnetLogAppender.java
@@ -8,9 +8,7 @@ import java.util.HashSet;
 import java.util.Set;
 import me.StevenLawson.BukkitTelnet.session.ClientSession;
 import me.StevenLawson.BukkitTelnet.session.FilterMode;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.appender.AbstractAppender;
 
 public class TelnetLogAppender extends AbstractAppender
diff --git a/src/me/StevenLawson/BukkitTelnet/session/ClientSession.java b/src/me/StevenLawson/BukkitTelnet/session/ClientSession.java
index 47c82ac..859a0aa 100644
--- a/src/me/StevenLawson/BukkitTelnet/session/ClientSession.java
+++ b/src/me/StevenLawson/BukkitTelnet/session/ClientSession.java
@@ -15,14 +15,11 @@ import me.StevenLawson.BukkitTelnet.BukkitTelnet;
 import me.StevenLawson.BukkitTelnet.TelnetConfig;
 import me.StevenLawson.BukkitTelnet.TelnetLogAppender;
 import me.StevenLawson.BukkitTelnet.TelnetLogger;
-import me.StevenLawson.BukkitTelnet.TelnetServer;
 import me.StevenLawson.BukkitTelnet.Util;
-import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.apache.logging.log4j.core.Logger;
 
 public final class ClientSession extends Thread
 {
diff --git a/src/me/StevenLawson/BukkitTelnet/session/FilterMode.java b/src/me/StevenLawson/BukkitTelnet/session/FilterMode.java
index 171f227..aaa55fc 100644
--- a/src/me/StevenLawson/BukkitTelnet/session/FilterMode.java
+++ b/src/me/StevenLawson/BukkitTelnet/session/FilterMode.java
@@ -2,5 +2,7 @@ package me.StevenLawson.BukkitTelnet.session;
 
 public enum FilterMode
 {
-    FULL, NONCHAT_ONLY, CHAT_ONLY
+    FULL,
+    NONCHAT_ONLY,
+    CHAT_ONLY;
 }
diff --git a/src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java b/src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java
index c537061..58dbdb6 100644
--- a/src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java
+++ b/src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java
@@ -13,7 +13,7 @@ public class SessionCommandSender implements CommandSender
 {
     private final ClientSession session;
 
-    protected SessionCommandSender(ClientSession session)
+    public SessionCommandSender(ClientSession session)
     {
         this.session = session;
     }