summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-03-17 20:23:46 +0000
committerKHobbits <rob@khobbits.co.uk>2012-03-17 20:23:46 +0000
commitb1e937525013ac5a11a5ce5286ea76743592244c (patch)
treec05e1d5c902491c10405ac6bc6db3e26f29c0589
parentaf8cf203e2965c33ca7708b0e6ce341b451f8045 (diff)
downloadEssentials-b1e937525013ac5a11a5ce5286ea76743592244c.tar
Essentials-b1e937525013ac5a11a5ce5286ea76743592244c.tar.gz
Essentials-b1e937525013ac5a11a5ce5286ea76743592244c.tar.lz
Essentials-b1e937525013ac5a11a5ce5286ea76743592244c.tar.xz
Essentials-b1e937525013ac5a11a5ce5286ea76743592244c.zip
Error and info cleanup.
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java7
-rw-r--r--Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java7
-rw-r--r--Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java1
-rw-r--r--Essentials/src/config.yml1
4 files changed, 8 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 684080f63..05e5df1aa 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -35,10 +35,8 @@ import com.earth2me.essentials.signs.SignPlayerListener;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -48,7 +46,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.command.Command;
-import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player;
@@ -139,10 +136,10 @@ public class Essentials extends JavaPlugin implements IEssentials
final int versionNumber = Integer.parseInt(versionMatch.group(1));
if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
{
- LOGGER.log(Level.SEVERE, "* ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+ LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
- LOGGER.log(Level.SEVERE, "* ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+ LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
this.setEnabled(false);
return;
}
diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
index d48b4a060..83452884b 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
+++ b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
@@ -14,7 +14,7 @@ public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> imp
{
private final transient File file;
private final transient Class<T> clazz;
- private final transient Plugin plugin;
+ protected final transient IEssentials plugin;
public AbstractDelayedYamlFileReader(final IEssentials ess, final File file, final Class<T> clazz)
{
@@ -54,7 +54,10 @@ public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> imp
catch (FileNotFoundException ex)
{
onException();
- Bukkit.getLogger().log(Level.INFO, "File not found: " + file.toString());
+ if (plugin.getSettings() == null || plugin.getSettings().isDebug())
+ {
+ Bukkit.getLogger().log(Level.INFO, "File not found: " + file.toString());
+ }
}
catch (ObjectLoadException ex)
{
diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
index 697ef7730..e8b3992ae 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
+++ b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
@@ -5,7 +5,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.util.logging.Level;
-import java.util.logging.Logger;
import org.bukkit.Bukkit;
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 2bbb87afc..3aea83772 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -175,6 +175,7 @@ kits:
# Essentials Sign Control
# See http://ess.khhq.net/wiki/Sign_Tutorial for instructions on how to use these.
# To enable signs, remove # symbol. To disable all signs, comment/remove each sign.
+# If there are no signs enabled, all sign features will be disabled including sign colours.
# We recommend not enabling chest protection signs if you don't intend to use them, (or are using LWC/Lockette).
enabledSigns: