From b0848ab2d4b1e0c991532fca32c7a7203c48ff29 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Sat, 24 Oct 2020 01:50:13 -0400
Subject: [PATCH] Prevent some Action prompts from closing the editor on
 invalid number

---
 .../quests/convo/actions/main/ActionMainPrompt.java         | 2 +-
 .../blackvein/quests/convo/actions/tasks/EffectPrompt.java  | 4 ++--
 .../blackvein/quests/convo/actions/tasks/PlayerPrompt.java  | 6 +++---
 .../blackvein/quests/convo/actions/tasks/TimerPrompt.java   | 2 +-
 .../blackvein/quests/convo/actions/tasks/WeatherPrompt.java | 6 +++---
 .../quests/convo/conditions/tasks/PlayerPrompt.java         | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java
index 9a3a7d2de..fc31fb1ac 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java
@@ -377,7 +377,7 @@ public class ActionMainPrompt extends ActionsEditorNumericPrompt {
             case 3:
                 return new ActionMainPrompt(context);
             default:
-                return null;
+                return new ActionMobListPrompt(context);
             }
         }
     }
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
index f860c7e8a..a05b5bedb 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
@@ -146,7 +146,7 @@ public class EffectPrompt extends ActionsEditorNumericPrompt {
         case 3:
             return new ActionMainPrompt(context);
         default:
-            return null;
+            return new EffectPrompt(context);
         }
     }
     
@@ -288,7 +288,7 @@ public class EffectPrompt extends ActionsEditorNumericPrompt {
                     return new EffectSoundListPrompt(context);
                 }
             default:
-                return null;
+                return new EffectSoundListPrompt(context);
             }
         }
     }
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java
index a65bf9b31..4c4c0e4cb 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java
@@ -248,7 +248,7 @@ public class PlayerPrompt extends ActionsEditorNumericPrompt {
         case 10:
             return new ActionMainPrompt(context);
         default:
-            return null;
+            return new PlayerPrompt(context);
         }
     }
     
@@ -399,7 +399,7 @@ public class PlayerPrompt extends ActionsEditorNumericPrompt {
             case 3:
                 return new ActionMainPrompt(context);
             default:
-                return new ActionMainPrompt(context);
+                return new PlayerItemListPrompt(context);
             }
         }
     }
@@ -569,7 +569,7 @@ public class PlayerPrompt extends ActionsEditorNumericPrompt {
                     return new PlayerPotionEffectPrompt(context);
                 }
             default:
-                return null;
+                return new PlayerPotionEffectPrompt(context);
             }
         }
     }
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java
index 4b85dbfae..775266da1 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java
@@ -125,7 +125,7 @@ public class TimerPrompt extends ActionsEditorNumericPrompt {
         case 3:
             return new ActionMainPrompt(context);
         default:
-            return null;
+            return new TimerPrompt(context);
         }
     }
     
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java
index b2e7c7422..6ca6b7ab5 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java
@@ -154,7 +154,7 @@ public class WeatherPrompt extends ActionsEditorNumericPrompt {
         case 4:
             return new ActionMainPrompt(context);
         default:
-            return null;
+            return new WeatherPrompt(context);
         }
     }
     
@@ -270,7 +270,7 @@ public class WeatherPrompt extends ActionsEditorNumericPrompt {
             case 4:
                 return new ActionMainPrompt(context);
             default:
-                return null;
+                return new StormPrompt(context);
             }
         }
     }
@@ -480,7 +480,7 @@ public class WeatherPrompt extends ActionsEditorNumericPrompt {
                     return new ActionMainPrompt(context);
                 }
             default:
-                return null;
+                return new ThunderPrompt(context);
             }
         }
     }
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
index 2f9114a79..07e70bb38 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
@@ -301,7 +301,7 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
             case 3:
                 return new PlayerPrompt(context);
             default:
-                return new PlayerPrompt(context);
+                return new ItemsInMainHandListPrompt(context);
             }
         }
     }