TotalFreedomMC/BukkitTelnet
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/BukkitTelnet.git synced 2024-06-16 08:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Only remove from TelnetLogAppender if the socket is truely closed. Resolves #3

Browse source 
Small changes.
This commit is contained in:
Jerom van der Sar 2014-06-15 16:40:09 +02:00
parent 4407c6ab95
commit 76f21c3487
6 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java
View file

@ -38,6 +38,6 @@ public class BukkitTelnet extends JavaPlugin
{ {
TelnetServer.getInstance().stopServer(); TelnetServer.getInstance().stopServer();
TelnetLogger.info("Plugin disabled."); TelnetLogger.info(plugin.getName() + " disabled.");
} }
} }

8
src/me/StevenLawson/BukkitTelnet/SocketListener.java
View file

@ -5,11 +5,8 @@ import java.io.IOException;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
public class SocketListener extends Thread public class SocketListener extends Thread
{ {
@ -53,11 +50,10 @@ public class SocketListener extends Thread
while (it.hasNext()) while (it.hasNext())
{ {
final ClientSession session = it.next(); final ClientSession session = it.next();
TelnetLogAppender.getInstance().removeSession(session);
if (!session.syncIsConnected()) if (!session.syncIsConnected())
{ {
TelnetLogAppender.getInstance().removeSession(session);
it.remove(); it.remove();
} }
} }

2
src/me/StevenLawson/BukkitTelnet/TelnetLogAppender.java
View file

@ -8,9 +8,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import me.StevenLawson.BukkitTelnet.session.ClientSession; import me.StevenLawson.BukkitTelnet.session.ClientSession;
import me.StevenLawson.BukkitTelnet.session.FilterMode; 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.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.AbstractAppender;
public class TelnetLogAppender extends AbstractAppender public class TelnetLogAppender extends AbstractAppender

3
src/me/StevenLawson/BukkitTelnet/session/ClientSession.java
View file

@ -15,14 +15,11 @@ import me.StevenLawson.BukkitTelnet.BukkitTelnet;
import me.StevenLawson.BukkitTelnet.TelnetConfig; import me.StevenLawson.BukkitTelnet.TelnetConfig;
import me.StevenLawson.BukkitTelnet.TelnetLogAppender; import me.StevenLawson.BukkitTelnet.TelnetLogAppender;
import me.StevenLawson.BukkitTelnet.TelnetLogger; import me.StevenLawson.BukkitTelnet.TelnetLogger;
import me.StevenLawson.BukkitTelnet.TelnetServer;
import me.StevenLawson.BukkitTelnet.Util; import me.StevenLawson.BukkitTelnet.Util;
import org.apache.logging.log4j.LogManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.apache.logging.log4j.core.Logger;
public final class ClientSession extends Thread public final class ClientSession extends Thread
{ {

4
src/me/StevenLawson/BukkitTelnet/session/FilterMode.java
View file

@ -2,5 +2,7 @@ package me.StevenLawson.BukkitTelnet.session;
public enum FilterMode public enum FilterMode
{ {
FULL, NONCHAT_ONLY, CHAT_ONLY FULL,
NONCHAT_ONLY,
CHAT_ONLY;
} }

2
src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java
View file

@ -13,7 +13,7 @@ public class SessionCommandSender implements CommandSender
{ {
private final ClientSession session; private final ClientSession session;
protected SessionCommandSender(ClientSession session) public SessionCommandSender(ClientSession session)
{ {
this.session = session; this.session = session;
} }