Revert
This commit is contained in:
parent
471e1c0d2c
commit
b6476dcb79
@ -6,8 +6,6 @@ import fr.xephi.authme.message.Messages;
|
|||||||
import fr.xephi.authme.permission.PermissionNode;
|
import fr.xephi.authme.permission.PermissionNode;
|
||||||
import fr.xephi.authme.permission.PermissionsManager;
|
import fr.xephi.authme.permission.PermissionsManager;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
import fr.xephi.authme.settings.properties.PluginSettings;
|
|
||||||
import fr.xephi.authme.util.Utils;
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
@ -24,9 +22,6 @@ public class CommonService {
|
|||||||
@Inject
|
@Inject
|
||||||
private Messages messages;
|
private Messages messages;
|
||||||
|
|
||||||
@Inject
|
|
||||||
private BukkitService bukkitService;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private PermissionsManager permissionsManager;
|
private PermissionsManager permissionsManager;
|
||||||
|
|
||||||
@ -51,11 +46,6 @@ public class CommonService {
|
|||||||
* @param key the message key
|
* @param key the message key
|
||||||
*/
|
*/
|
||||||
public void send(CommandSender sender, MessageKey key) {
|
public void send(CommandSender sender, MessageKey key) {
|
||||||
if (Utils.majorVersion < 12 && settings.getProperty(PluginSettings.I18N_MESSAGES)) {
|
|
||||||
bukkitService.runTaskLater(() -> messages.send(sender, key), 35L);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
messages.send(sender, key);
|
messages.send(sender, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,11 +57,6 @@ public class CommonService {
|
|||||||
* @param replacements the replacements to apply to the message
|
* @param replacements the replacements to apply to the message
|
||||||
*/
|
*/
|
||||||
public void send(CommandSender sender, MessageKey key, String... replacements) {
|
public void send(CommandSender sender, MessageKey key, String... replacements) {
|
||||||
if (Utils.majorVersion < 12 && settings.getProperty(PluginSettings.I18N_MESSAGES)) {
|
|
||||||
bukkitService.runTaskLater(() -> messages.send(sender, key, replacements), 35L);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
messages.send(sender, key, replacements);
|
messages.send(sender, key, replacements);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,6 @@ public final class PlayerUtils {
|
|||||||
// Utility class
|
// Utility class
|
||||||
private PlayerUtils() {
|
private PlayerUtils() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final boolean IS_LEAVES_SERVER = Utils.isClassLoaded("top.leavesmc.leaves.LeavesConfig");
|
private static final boolean IS_LEAVES_SERVER = Utils.isClassLoaded("top.leavesmc.leaves.LeavesConfig");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -36,4 +35,5 @@ public final class PlayerUtils {
|
|||||||
return player.hasMetadata("NPC");
|
return player.hasMetadata("NPC");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user