package com.hyperfresh.mchyperchat.bukkit;

import com.hyperfresh.mchyperchat.HyperChat;
import com.hyperfresh.mchyperchat.Theme;
import com.hyperfresh.mchyperchat.User;
import org.bukkit.command.ConsoleCommandSender;

/**
 * A wrapper for the Bukkit ConsoleCommandSender.
 */
public class BukkitConsole implements User
{
	private final ConsoleCommandSender handle;

	private String lastSaid;

	private Theme theme = HyperChat.getThemeManager().getDefaultTheme();

	public BukkitConsole(ConsoleCommandSender console, String lastSaid)
	{
		this.handle = console;
		this.lastSaid = lastSaid;
	}

	@Override
	public String getName()
	{
		return handle.getName();
	}

	@Override
	public String getLastMessage()
	{
		return lastSaid;
	}

	@Override
	public void setLastMessage(String said)
	{
		lastSaid = said;
	}

	@Override
	public void sendMessage(String message)
	{
		handle.sendMessage(message);
	}

	@Override
	public Theme getTheme()
	{
		return theme;
	}

	@Override
	public void setTheme(Theme theme)
	{
		this.theme = theme;
	}
}

@@ -373,94 +373,52 @@
 ate 
-String lastSaid;%0A%0A%09private Theme theme = HyperChat.getThemeManager().getDefaultTheme()
+Theme theme;%0A%09private String lastSaid = null
 ;%0A%0A%09
@@ -438,16 +438,37 @@
 Console(
+HyperChat hyperChat, 
 ConsoleC
@@ -491,25 +491,8 @@
 sole
-, String lastSaid
 )%0A%09%7B
@@ -528,27 +528,61 @@
 his.
-lastSaid = lastSaid
+theme = hyperChat.getThemeManager().getDefaultTheme()
 ;%0A%09%7D

change BukkitConstructor constructor