|
@@ -146,12 +146,12 @@ public class Scripts {
|
|
|
// -------------------------------------------------------------------------
|
|
|
// script starting
|
|
|
// -------------------------------------------------------------------------
|
|
|
- public boolean startPlayerScript(PlayerEntity p, String... names) {
|
|
|
+ public Script startPlayerScript(PlayerEntity p, String... names) {
|
|
|
if(isRegistered(p)) {
|
|
|
- return false;
|
|
|
+ return null;
|
|
|
}
|
|
|
Arrays.setAll(names, i -> "scripts/" + names[i] + ".txt");
|
|
|
- manager.startScript(false, sc -> {
|
|
|
+ return manager.startScript(false, sc -> {
|
|
|
int id = sc.getId();
|
|
|
playerScript.put(p.getUniqueID(), id);
|
|
|
getOrCreatePlayerList(id).add(p.getUniqueID());
|
|
@@ -160,12 +160,11 @@ public class Scripts {
|
|
|
registeredPlayers.remove(sc.getId());
|
|
|
cec.removeScriptData(sc);
|
|
|
}, names[0], names);
|
|
|
- return true;
|
|
|
}
|
|
|
|
|
|
- public void startScript(String... names) {
|
|
|
+ public Script startScript(String... names) {
|
|
|
Arrays.setAll(names, i -> "scripts/" + names[i] + ".txt");
|
|
|
- manager.startScript(true, sc -> {
|
|
|
+ return manager.startScript(true, sc -> {
|
|
|
}, sc -> cec.removeScriptData(sc), names[0], names);
|
|
|
}
|
|
|
}
|