Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-22 10:36:09 +01:00
Code Issues Projects Releases Wiki Activity

Fixed more bugs.

Browse Source
This commit is contained in:
Blackvein 2013-09-18 17:51:36 -07:00
parent 305e238d9f
commit 8b57d1e83a
4 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/me/blackvein/quests/Quest.java
View File

@ -279,7 +279,6 @@ public class Quest {
}
q.currentQuest = null;
System.out.println(plugin.getQuester(q.name).currentQuest.getName());
q.currentStage = null;
q.currentStageIndex = 0;

10
src/main/java/me/blackvein/quests/Quests.java
View File

@ -1,5 +1,7 @@
package me.blackvein.quests;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.mcMMO;
import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
@ -18,7 +20,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
import me.ThaH3lper.com.EpicBoss;
import me.ThaH3lper.com.LoadBosses.LoadBoss;
import me.blackvein.quests.prompts.QuestAcceptPrompt;
@ -32,7 +33,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.DyeColor;
@ -63,9 +63,6 @@ import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.skills.SkillType;
public class Quests extends JavaPlugin implements ConversationAbandonedListener, ColorUtil {
public final static Logger log = Logger.getLogger("Minecraft");
@ -3787,6 +3784,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
public static String getCurrency(boolean plural) {
if(Quests.economy == null)
return "Money";
if (plural) {
if (Quests.economy.currencyNamePlural().trim().isEmpty()) {
return "Money";

4
src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
View File

@ -3661,7 +3661,7 @@ public class CreateStagePrompt extends FixedSetPrompt implements ColorUtil {
LoadBoss found = null;
for (LoadBoss b : Quests.epicBoss.BossLoadList) {
if (b.getName().equalsIgnoreCase(input)) {
if (b.getName().equalsIgnoreCase(id)) {
found = b;
break;
}
@ -3704,7 +3704,7 @@ public class CreateStagePrompt extends FixedSetPrompt implements ColorUtil {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
String[] amounts = input.split(",");
String[] amounts = input.split(" ");
LinkedList<Integer> amountList = new LinkedList<Integer>();
for (String amount : amounts) {

2
src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -92,8 +92,6 @@ public class Lang {
//create prompt
en.put("stageEditorStages", "Stages");
en.put("stageEditorStage", "Stage");
en.put("stageEditorEditStage", "Edit Stage");
en.put("stageEditorNewStage", "Add new Stage");
en.put("stageEditorBreakBlocks", "Break Blocks");
en.put("stageEditorDamageBlocks", "Damage Blocks");
en.put("stageEditorPlaceBlocks", "Place Blocks");