Expanded internal webserver to also handle web and tiles, where web-files can be retrieved from filesystem or jar. Also some debugging changes.

This commit is contained in:
FrozenCow 2011-01-07 04:50:43 +01:00
parent b4fca31cd5
commit 6a7559f3ad
11 changed files with 247 additions and 84 deletions

View file

@ -4,6 +4,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
import org.bukkit.*;
import org.dynmap.debug.Debugger;
import java.util.logging.Logger;
@ -12,14 +13,19 @@ public class WebServer extends Thread {
public static final String VERSION = "Huncraft";
protected static final Logger log = Logger.getLogger("Minecraft");
private Debugger debugger;
private ServerSocket sock = null;
private boolean running = false;
private MapManager mgr;
private Server server;
public WebServer(int port, MapManager mgr) throws IOException
public WebServer(int port, MapManager mgr, Server server, Debugger debugger) throws IOException
{
this.mgr = mgr;
this.server = server;
this.debugger = debugger;
sock = new ServerSocket(port, 5, mgr.bindaddress.equals("0.0.0.0") ? null : InetAddress.getByName(mgr.bindaddress));
running = true;
start();
@ -31,7 +37,7 @@ public class WebServer extends Thread {
while (running) {
try {
Socket socket = sock.accept();
WebServerRequest requestThread = new WebServerRequest(socket, mgr);
WebServerRequest requestThread = new WebServerRequest(socket, mgr, server, debugger);
requestThread.start();
}
catch (IOException e) {