mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #1988

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-06-14 02:36:32 +02:00
parent 0a6e00fae5
commit 85af23c17c
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -49,6 +49,7 @@
* Fixed Nuclear Reactors accepting Lava as coolant * Fixed Nuclear Reactors accepting Lava as coolant
* Fixed #1971 * Fixed #1971
* Fixed #1976 * Fixed #1976
* Fixed #1988
## Release Candidate 12 (27 May 2020) ## Release Candidate 12 (27 May 2020)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java
View File

@ -162,7 +162,7 @@ enum Instruction {
} }
public void execute(ProgrammableAndroid android, Block b, BlockMenu inventory, BlockFace face) { 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); method.perform(android, b, inventory, face);
} }

4
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
View File

@ -625,6 +625,10 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent
BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"));
switch (instruction) { switch (instruction) {
case START:
case WAIT:
// Just "waiting" here which means we do nothing
break;
case REPEAT: case REPEAT:
BlockStorage.addBlockInfo(b, "index", String.valueOf(0)); BlockStorage.addBlockInfo(b, "index", String.valueOf(0));
break; break;

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java
View File

@ -195,7 +195,7 @@ public final class Script {
} }
public static void upload(Player p, AndroidType androidType, int id, String name, String code) { 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", p.getUniqueId().toString());
config.setValue("author_name", p.getName()); config.setValue("author_name", p.getName());