Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-05 07:57:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix editor sometimes closing. Bump version number

Browse Source
This commit is contained in:
HappyPikachu 2017-07-23 14:29:48 -04:00
parent a58b51b469
commit 1ab2ab4f02
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId> <groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId> <artifactId>quests</artifactId>
<version>2.9.4</version> <version>2.9.5</version>
<name>quests</name> <name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url> <url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging> <packaging>jar</packaging>

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

@ -733,7 +733,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
@Override @Override
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
return ChatColor.YELLOW + Lang.get("stageEditorBreakBlocksPrompt"); return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
} }
@Override @Override
@ -853,6 +853,9 @@ public class CreateStagePrompt extends FixedSetPrompt {
} }
context.setSessionData(pref + CK.S_DAMAGE_DURABILITY, elements); context.setSessionData(pref + CK.S_DAMAGE_DURABILITY, elements);
return new DamageBlockListPrompt(); return new DamageBlockListPrompt();
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListNotSameSize"));
return new DamageBlockListPrompt();
} }
} }
return null; return null;
@ -945,7 +948,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
@Override @Override
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
return ChatColor.YELLOW + Lang.get("stageEditorDamageBlocksPrompt"); return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
} }
@Override @Override
@ -1065,6 +1068,9 @@ public class CreateStagePrompt extends FixedSetPrompt {
} }
context.setSessionData(pref + CK.S_PLACE_DURABILITY, elements); context.setSessionData(pref + CK.S_PLACE_DURABILITY, elements);
return new PlaceBlockListPrompt(); return new PlaceBlockListPrompt();
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListNotSameSize"));
return new PlaceBlockListPrompt();
} }
} }
return null; return null;
@ -1157,7 +1163,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
@Override @Override
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
return ChatColor.YELLOW + Lang.get("stageEditorPlaceBlocksPrompt"); return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
} }
@Override @Override
@ -1276,6 +1282,9 @@ public class CreateStagePrompt extends FixedSetPrompt {
elements.add(0); elements.add(0);
} }
context.setSessionData(pref + CK.S_USE_DURABILITY, elements); context.setSessionData(pref + CK.S_USE_DURABILITY, elements);
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListNotSameSize"));
return new UseBlockListPrompt();
} }
} }
return null; return null;
@ -1368,7 +1377,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
@Override @Override
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
return ChatColor.YELLOW + Lang.get("stageEditorUseBlocksPrompt"); return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
} }
@Override @Override
@ -1488,6 +1497,9 @@ public class CreateStagePrompt extends FixedSetPrompt {
} }
context.setSessionData(pref + CK.S_CUT_DURABILITY, elements); context.setSessionData(pref + CK.S_CUT_DURABILITY, elements);
return new CutBlockListPrompt(); return new CutBlockListPrompt();
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListNotSameSize"));
return new CutBlockListPrompt();
} }
} }
return null; return null;
@ -1580,7 +1592,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
@Override @Override
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
return ChatColor.YELLOW + Lang.get("stageEditorCutBlocksPrompt"); return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
} }
@Override @Override

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

@ -272,12 +272,13 @@ public class Lang {
langMap.put("stageEditorCustomAlreadyAdded", "That custom objective has already been added!"); langMap.put("stageEditorCustomAlreadyAdded", "That custom objective has already been added!");
langMap.put("stageEditorCustomCleared", "Custom objectives cleared."); langMap.put("stageEditorCustomCleared", "Custom objectives cleared.");
langMap.put("stageEditorCustomDataPrompt", "Enter value for <data>:"); langMap.put("stageEditorCustomDataPrompt", "Enter value for <data>:");
langMap.put("stageEditorEnterBlockNames", "Enter block names, separating each one by a space, or enter \'cancel\' to return."); langMap.put("stageEditorEnterBlockNames", "Enter block names (or IDs), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorBreakBlocksPrompt", "Enter block amounts (numbers), separating each one by a space, or enter \'cancel\' to return."); langMap.put("stageEditorBreakBlocksPrompt", "Enter break amounts (numbers), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorDamageBlocksPrompt", "Enter damage amounts (numbers), separating each one by a space, or enter \'cancel\' to return."); langMap.put("stageEditorDamageBlocksPrompt", "Enter damage amounts (numbers), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorPlaceBlocksPrompt", "Enter place amounts (numbers), separating each one by a space, or enter \'cancel\' to return."); langMap.put("stageEditorPlaceBlocksPrompt", "Enter place amounts (numbers), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorUseBlocksPrompt", "Enter use amounts (numbers), separating each one by a space, or enter \'cancel\' to return."); langMap.put("stageEditorUseBlocksPrompt", "Enter use amounts (numbers), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorCutBlocksPrompt", "Enter cut amounts (numbers), separating each one by a space, or enter \'cancel\' to return."); langMap.put("stageEditorCutBlocksPrompt", "Enter cut amounts (numbers), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorEnterBlockDurability", "Enter block durability (numbers), separating each one by a space, or enter \'cancel\' to return.");
langMap.put("stageEditorCatchFishPrompt", "Enter number of fish to catch, or 0 to clear the fish catch objective, or -1 to cancel"); langMap.put("stageEditorCatchFishPrompt", "Enter number of fish to catch, or 0 to clear the fish catch objective, or -1 to cancel");
langMap.put("stageEditorKillPlayerPrompt", "Enter number of players to kill, or 0 to clear the player kill objective, or -1 to cancel"); langMap.put("stageEditorKillPlayerPrompt", "Enter number of players to kill, or 0 to clear the player kill objective, or -1 to cancel");
langMap.put("stageEditorEnchantTypePrompt", "Enter enchantment names, separating each one by a comma, or enter \'cancel\' to return."); langMap.put("stageEditorEnchantTypePrompt", "Enter enchantment names, separating each one by a comma, or enter \'cancel\' to return.");