Compare commits

..

No commits in common. "2f7f8e3bee667fc490b50679907384ad985220b0" and "90df1fa5fb65f44a9d9991289e5189d92bbaadb7" have entirely different histories.

6 changed files with 4 additions and 10 deletions

View File

@ -6,7 +6,7 @@
<groupId>net.t2code</groupId> <groupId>net.t2code</groupId>
<artifactId>T2CodeLib</artifactId> <artifactId>T2CodeLib</artifactId>
<version>16.7_dev-27</version> <version>16.7_dev-24</version>
<!--version>VERSION_snapshot-0</version--> <!--version>VERSION_snapshot-0</version-->
<!--version>VERSION_beta-0</version--> <!--version>VERSION_beta-0</version-->
<!--version>VERSION_dev-0</version--> <!--version>VERSION_dev-0</version-->

View File

@ -1,6 +1,5 @@
package net.t2code.t2codelib.SPIGOT.api.commands; package net.t2code.t2codelib.SPIGOT.api.commands;
import me.clip.placeholderapi.PlaceholderAPI;
import net.t2code.t2codelib.SPIGOT.system.T2C_ProxyCommandSenderReceiver; import net.t2code.t2codelib.SPIGOT.system.T2C_ProxyCommandSenderReceiver;
import net.t2code.t2codelib.SPIGOT.system.T2C_Main; import net.t2code.t2codelib.SPIGOT.system.T2C_Main;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -25,7 +24,7 @@ public class T2C_Cmd {
} }
public static void player(Player player, String cmdInput) { public static void player(Player player, String cmdInput) {
Map.Entry<String,Integer> map = delay(PlaceholderAPI.setPlaceholders(player, cmdInput)); Map.Entry<String,Integer> map = delay(cmdInput);
int delay = map.getValue(); int delay = map.getValue();
String cmd = map.getKey(); String cmd = map.getKey();
Bukkit.getScheduler().runTaskLater(T2C_Main.getPlugin(), new Runnable() { Bukkit.getScheduler().runTaskLater(T2C_Main.getPlugin(), new Runnable() {

View File

@ -7,6 +7,7 @@ import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
public class T2C_Replace { public class T2C_Replace {

View File

@ -330,8 +330,4 @@ public class T2C_McVersion {
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17() return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17()
&& !isMc1_18() && !isMc1_19(); && !isMc1_18() && !isMc1_19();
} }
public static boolean minMc1_21() {
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17()
&& !isMc1_18() && !isMc1_19() && !isMc1_20();
}
} }

View File

@ -61,8 +61,6 @@ public class T2C_ConfigWriter {
} }
} }
// Copy default values if they are missing // Copy default values if they are missing
config.options().copyDefaults(true); config.options().copyDefaults(true);

View File

@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public class T2C_YmlWriter { public class T2C_YmlWriter {
public static void saveConfigWithComments(File file, FileConfiguration config, Map<String, List<String>> comments, boolean oneListToString,String... headers) { protected static void saveConfigWithComments(File file, FileConfiguration config, Map<String, List<String>> comments, boolean oneListToString,String... headers) {
try { try {
StringBuilder configContent = new StringBuilder(); StringBuilder configContent = new StringBuilder();
for (String h : headers) { for (String h : headers) {