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

Save actual effect name to actions config, fixes #1389

Browse Source
This commit is contained in:
PikaMug 2020-08-23 21:13:40 -04:00
parent ea0a2087e6
commit bcb8e75de0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3070,7 +3070,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
try { try {
effect = Effect.valueOf(s.toUpperCase()); effect = Effect.valueOf(s.toUpperCase());
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
throw new ActionFormatException("effect-locations is not a valid effect name", throw new ActionFormatException(s + " is not a valid effect name",
actionKey); actionKey);
} }
final Location l = ConfigUtil.getLocation(effectLocs.get(effectList.indexOf(s))); final Location l = ConfigUtil.getLocation(effectLocs.get(effectList.indexOf(s)));

2
main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
View File

@ -341,7 +341,7 @@ public class EffectPrompt extends ActionsEditorNumericPrompt {
} else { } else {
effects = new LinkedList<String>(); effects = new LinkedList<String>();
} }
effects.add(input.toUpperCase()); effects.add(MiscUtil.getProperEffect(input).name());
context.setSessionData(CK.E_EFFECTS, effects); context.setSessionData(CK.E_EFFECTS, effects);
final Map<UUID, Block> selectedEffectLocations = plugin.getActionFactory().getSelectedEffectLocations(); final Map<UUID, Block> selectedEffectLocations = plugin.getActionFactory().getSelectedEffectLocations();
selectedEffectLocations.remove(player.getUniqueId()); selectedEffectLocations.remove(player.getUniqueId());