From 85af23c17c517a45dbf7d027ed5629196c06eb75 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Sun, 14 Jun 2020 02:36:32 +0200
Subject: [PATCH] Fixes #1988

---
 CHANGELOG.md                                                  | 1 +
 .../slimefun4/implementation/items/androids/Instruction.java  | 2 +-
 .../implementation/items/androids/ProgrammableAndroid.java    | 4 ++++
 .../slimefun4/implementation/items/androids/Script.java       | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31158984d..c4a166721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 * Fixed Nuclear Reactors accepting Lava as coolant
 * Fixed #1971
 * Fixed #1976
+* Fixed #1988
 
 ## Release Candidate 12 (27 May 2020)
 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java
index 8635eb8b0..a5e560a00 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java
@@ -162,7 +162,7 @@ enum Instruction {
     }
 
     public void execute(ProgrammableAndroid android, Block b, BlockMenu inventory, BlockFace face) {
-        Validate.notNull(method, "This Instruction must be executed manually!");
+        Validate.notNull(method, "Instruction '" + name() + "' must be executed manually!");
         method.perform(android, b, inventory, face);
     }
 
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
index 313a96c9d..c0dcbea72 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
@@ -625,6 +625,10 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent
                     BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"));
 
                     switch (instruction) {
+                    case START:
+                    case WAIT:
+                        // Just "waiting" here which means we do nothing
+                        break;
                     case REPEAT:
                         BlockStorage.addBlockInfo(b, "index", String.valueOf(0));
                         break;
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java
index 8b0daf56b..b7093dc7a 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java
@@ -195,7 +195,7 @@ public final class Script {
     }
 
     public static void upload(Player p, AndroidType androidType, int id, String name, String code) {
-        Config config = new Config("plugins/Slimefun/scripts/" + androidType.name() + '/' + p.getName() + ' ' + String.valueOf(id) + ".sfs");
+        Config config = new Config("plugins/Slimefun/scripts/" + androidType.name() + '/' + p.getName() + ' ' + id + ".sfs");
 
         config.setValue("author", p.getUniqueId().toString());
         config.setValue("author_name", p.getName());