From e0e6222bb09fcbc952c7f5c12ae5059f49177a5e Mon Sep 17 00:00:00 2001 From: HappyPikachu Date: Wed, 5 Jul 2017 01:02:48 -0400 Subject: [PATCH] Remove debug-mode; show ALL the errors --- .../me/blackvein/quests/PlayerListener.java | 8 ++--- .../java/me/blackvein/quests/Quester.java | 1 - src/main/java/me/blackvein/quests/Quests.java | 33 +++++-------------- src/main/resources/config.yml | 1 - 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/src/main/java/me/blackvein/quests/PlayerListener.java b/src/main/java/me/blackvein/quests/PlayerListener.java index e26664da2..7e13ed465 100644 --- a/src/main/java/me/blackvein/quests/PlayerListener.java +++ b/src/main/java/me/blackvein/quests/PlayerListener.java @@ -282,9 +282,7 @@ public class PlayerListener implements Listener { for (Quest quest : quester.currentQuests.keySet()) { Stage currentStage = quester.getCurrentStage(quest); if (currentStage == null) { - if (plugin.debug == true) { - plugin.getLogger().severe("currentStage was null for " + quester.id.toString() + " on chat"); - } + plugin.getLogger().severe("currentStage was null for " + quester.id.toString() + " on chat"); continue; } if (currentStage.chatEvents.isEmpty() == false) { @@ -642,9 +640,7 @@ public class PlayerListener implements Listener { for (Quest quest : quester.currentQuests.keySet()) { Stage currentStage = quester.getCurrentStage(quest); if (currentStage == null) { - if (plugin.debug == true) { - plugin.getLogger().severe("currentStage was null for " + quester.id.toString() + " on quit"); - } + plugin.getLogger().severe("currentStage was null for " + quester.id.toString() + " on quit"); continue; } if (currentStage.delay > -1) { diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java index 79d0f4abd..76c6340eb 100644 --- a/src/main/java/me/blackvein/quests/Quester.java +++ b/src/main/java/me/blackvein/quests/Quester.java @@ -949,7 +949,6 @@ public class Quester { public void reachLocation(Quest quest, Location l) { for (Location location : getQuestData(quest).locationsReached) { - // TODO debug try/catch for #352 try { int index = getQuestData(quest).locationsReached.indexOf(location); Location locationToReach = getCurrentStage(quest).locationsToReach.get(index); diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java index d8cc2002b..2f41d14eb 100644 --- a/src/main/java/me/blackvein/quests/Quests.java +++ b/src/main/java/me/blackvein/quests/Quests.java @@ -125,7 +125,6 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener public boolean allowCommandsForNpcQuests = false; public boolean showQuestReqs = true; public boolean allowQuitting = true; - public boolean debug = false; public boolean convertData = false; public boolean load = false; public int killDelay = 0; @@ -414,7 +413,6 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener genFilesOnJoin = config.getBoolean("generate-files-on-join", true); npcEffects = config.getBoolean("show-npc-effects", true); effect = config.getString("npc-effect", "note"); - debug = config.getBoolean("debug-mode", false); killDelay = config.getInt("kill-delay", 600); acceptTimeout = config.getInt("accept-timeout", 20); convertData = config.getBoolean("convert-data-on-startup", false); @@ -522,10 +520,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener getLogger().info("Registered events for custom objective \"" + name + "\""); } catch (Exception ex) { getLogger().warning("Failed to register events for custom objective \"" + name + "\". Does the objective class listen for events?"); - if (debug) { - getLogger().warning("Error log:"); - ex.printStackTrace(); - } + ex.printStackTrace(); } } } @@ -534,10 +529,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener } } catch (Exception e) { getLogger().severe("Unable to load module from file: " + jar.getName()); - if (debug) { - getLogger().severe("Error log:"); - e.printStackTrace(); - } + e.printStackTrace(); } } @@ -1942,7 +1934,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener quester = questers.get(id); } if (quester == null) { - if (debug == true && !questerBlacklist.contains(id.toString())) { + if (!questerBlacklist.contains(id.toString())) { getLogger().log(Level.WARNING, "Quester data for UUID \"" + id.toString() + "\" not stored. Attempting manual data retrieval.."); } quester = new Quester(this); @@ -1955,7 +1947,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener } getLogger().info("Quester not found for UUID \"" + id.toString() + "\". Consider adding them to the Quester blacklist."); } else { - if (debug == true && !questerBlacklist.contains(id.toString())) { + if (!questerBlacklist.contains(id.toString())) { getLogger().log(Level.INFO, "Manual data retrieval succeeded for UUID \"" + id.toString() + "\""); } questers.put(id, quester); @@ -2105,12 +2097,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener try { config.save(file); } catch (IOException e) { - if (debug == false) { - getLogger().log(Level.SEVERE, "Failed to load Quest \"" + questName + "\". Skipping."); - } else { - getLogger().log(Level.SEVERE, "Failed to load Quest \"" + questName + "\". Error log:"); - e.printStackTrace(); - } + getLogger().log(Level.SEVERE, "Failed to save Quest \"" + questName + "\""); + e.printStackTrace(); } } if (failedToLoad == true) { @@ -3907,13 +3895,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener config.set("npc-gui", questNPCGUIs); config.save(dataFile); } catch (Exception e) { - getLogger().severe("Unable to update data file."); - if (debug) { - getLogger().severe("Error log:"); - e.printStackTrace(); - } else { - getLogger().severe("Enable debug to view the error getLogger()"); - } + getLogger().severe("Unable to update data.yml file"); + e.printStackTrace(); } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index e8f079e80..b2469fa40 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -5,7 +5,6 @@ show-requirements: true allow-quitting: true use-compass: true ignore-locked-quests: false -debug-mode: false generate-files-on-join: true kill-delay: 600 accept-timeout: 20