From 4ab4c142c40f19a2694ba4a73b80f9f9e8f5ea6f Mon Sep 17 00:00:00 2001
From: artem <misterzym@mail.ru>
Date: Thu, 27 Sep 2018 16:29:45 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20=D1=81=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BD=20=D0=BD=D0=B5=20=D1=83=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD,=20=D1=80=D0=B5=D1=84=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setspawn/SetSpawn.java | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/setspawn/SetSpawn.java b/setspawn/SetSpawn.java
index 9d76a08..559435e 100644
--- a/setspawn/SetSpawn.java
+++ b/setspawn/SetSpawn.java
@@ -16,15 +16,17 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 public class SetSpawn extends JavaPlugin implements Listener {
 
-    private String notPerm = ChatColor.RED + "У вас нет прав на использование команды!";
-
+    private final String pref="&0[&fСпавн&0]&r";
+    private final String notPerm = pref+ChatColor.RED + " У вас нет прав на использование команды!";
+    
+    @Override
     public void onEnable() {
         Bukkit.getPluginManager().registerEvents(this, this);
         getLogger().info("Spawn has been enabled!");
-        getConfig().addDefault("Spawn-Message", "&0[&fСпавн&0]&r: &2Вы на спавне!");
-        getConfig().addDefault("Set-Spawn-Message", "&0[&fСпавн&0]&r: &eВы установили спавн!");
-        getConfig().addDefault("No-Spawn-Message", "&0[&fСпавн&0]&r: &cСпавн не установлен!");
-        getConfig().addDefault("Reload-Message", "&0[&fСпавн&0]&r: &2Настройки перезагружены!");
+        getConfig().addDefault("Spawn-Message", pref+": &2Вы на спавне!");
+        getConfig().addDefault("Set-Spawn-Message", pref+": &eВы установили спавн!");
+        getConfig().addDefault("No-Spawn-Message", pref+": &cСпавн не установлен!");
+        getConfig().addDefault("Reload-Message", pref+": &2Настройки перезагружены!");
         getConfig().addDefault("Spawn-Effect", true);
         getConfig().addDefault("On-Join-Spawn", true);
         getConfig().addDefault("On-First-Spawn", true);
@@ -33,10 +35,12 @@ public class SetSpawn extends JavaPlugin implements Listener {
         saveConfig();
     }
 
+    @Override
     public void onDisable() {
         getLogger().info("Spawn has been disabled!");
     }
 
+    @Override
     public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
         final Player p = (Player) sender;
         if (!sender.hasPermission("spawn.spawn")) {
@@ -99,6 +103,10 @@ public class SetSpawn extends JavaPlugin implements Listener {
     public void onJoin(PlayerJoinEvent e) {
         final Player p = e.getPlayer();
         if (getConfig().getBoolean("On-Join-Spawn") || (getConfig().getBoolean("On-First-Spawn") && !e.getPlayer().hasPlayedBefore())) {
+            if (getConfig().getConfigurationSection("spawn") == null) {
+                p.sendMessage(ChatColor.translateAlternateColorCodes('&', getConfig().getString("No-Spawn-Message")));
+                return;
+            }
             new BukkitRunnable() {
                 public void run() {
                     World w = Bukkit.getServer().getWorld(getConfig().getString("spawn.world"));