Skip to content
This repository was archived by the owner on Sep 20, 2021. It is now read-only.

Commit 6c071ff

Browse files
committed
[v2.0.8-jv8]
1 parent e8a7752 commit 6c071ff

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/main/java/com/github/yuttyann/scriptblockplus/file/config/SBConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,22 +198,22 @@ public final class SBConfig {
198198
public static final ReplaceKey SCRIPT_REDSTONE_DISABLE = replaceKey("ScriptRedstoneDisableMessage", "", FUNCTION_SCRIPT_TYPE);
199199

200200
/**
201-
* Parameter: {@link String} world, {@link String} coords
201+
* Parameter: {@link String} worldName, {@link String} coords
202202
*/
203203
public static final ReplaceKey SELECTOR_POS1 = replaceKey("SelectorPos1Message", "", "%world%", "%coords%");
204204

205205
/**
206-
* Parameter: {@link String} world, {@link String} coords
206+
* Parameter: {@link String} worldName, {@link String} coords
207207
*/
208208
public static final ReplaceKey SELECTOR_POS2 = replaceKey("SelectorPos2Message", "", "%world%", "%coords%");
209209

210210
/**
211-
* Parameter: {@link String} scriptKey, {@link Integer} blockCount
211+
* Parameter: {@link String} scriptKeyName, {@link Integer} blockCount
212212
*/
213213
public static final ReplaceKey SELECTOR_PASTE = replaceKey("SelectorPasteMessage", "", "%scriptkey%", "%blockcount%");
214214

215215
/**
216-
* Parameter: {@link String} scriptKey, {@link Integer} blockCount
216+
* Parameter: {@link String} scriptKeyName, {@link Integer} blockCount
217217
*/
218218
public static final ReplaceKey SELECTOR_REMOVE = replaceKey("SelectorRemoveMessage", "", "%scriptkey%", "%blockcount%");
219219

@@ -278,12 +278,12 @@ public final class SBConfig {
278278
public static final ReplaceKey CONSOLE_ERROR_SCRIPT_EXECUTE = replaceKey("ConsoleErrorScriptExecMessage", "", FUNCTION_CONSOLE_SCRIPT);
279279

280280
/**
281-
* Parameter: {@link ScriptKey} scriptKey, {@link CuboidRegionIterator} iterator
281+
* Parameter: {@link String} scriptKeyName, {@link CuboidRegionIterator} iterator
282282
*/
283283
public static final ReplaceKey CONSOLE_SELECTOR_PASTE = replaceKey("ConsoleSelectorPasteMessage", "", FUNCTION_CONSOLE_SELECTOR);
284284

285285
/**
286-
* Parameter: {@link ScriptKey} scriptKey, {@link CuboidRegionIterator} iterator
286+
* Parameter: {@link String} scriptKeyNames, {@link CuboidRegionIterator} iterator
287287
*/
288288
public static final ReplaceKey CONSOLE_SELECTOR_REMOVE = replaceKey("ConsoleSelectorRemoveMessage", "", FUNCTION_CONSOLE_SELECTOR);
289289
}

src/main/java/com/github/yuttyann/scriptblockplus/script/SBClipboard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ public boolean paste(@NotNull BlockCoords blockCoords, boolean overwrite) {
131131
scriptJson.saveFile();
132132
PlayerTempJson.removeAll(scriptKey, blockCoords);
133133
PlayerCountJson.removeAll(scriptKey, blockCoords);
134-
SBConfig.SCRIPT_PASTE.replace(scriptKey, blockCoords).send(sbPlayer);
135-
SBConfig.CONSOLE_SCRIPT_EDIT.replace(sbPlayer.getName(), blockCoords, scriptKey).console();
134+
SBConfig.SCRIPT_PASTE.replace(scriptKey).send(sbPlayer);
135+
SBConfig.CONSOLE_SCRIPT_EDIT.replace(scriptKey, blockCoords).console();
136136
} finally {
137137
sbPlayer.setScriptEdit(null);
138138
sbPlayer.setSBClipboard(null);

src/main/java/com/github/yuttyann/scriptblockplus/script/ScriptRead.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public boolean read(final int index) {
126126
}
127127
if (!sortScripts(blockScript.get(blockCoords).getScript())) {
128128
SBConfig.ERROR_SCRIPT_EXECUTE.replace(scriptKey).send(sbPlayer);
129-
SBConfig.CONSOLE_ERROR_SCRIPT_EXECUTE.replace(blockCoords, scriptKey).console();
129+
SBConfig.CONSOLE_ERROR_SCRIPT_EXECUTE.replace(scriptKey, blockCoords).console();
130130
return false;
131131
}
132132
Bukkit.getPluginManager().callEvent(new ScriptReadStartEvent(ramdomId, this));

0 commit comments

Comments
 (0)