diff --git a/pom.xml b/pom.xml
index 44fe435..eae63de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.youhavetrouble
PreventStabby
- 1.3-pre5
+ 1.3
jar
PreventStabby
diff --git a/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java b/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
index b3b2538..904ed9c 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
@@ -77,7 +77,7 @@ public final class PreventStabby extends JavaPlugin {
worldGuardHook = false;
}
- Metrics metrics = new Metrics(this, 10597);
+ Metrics metrics = new Metrics(this, 14074);
}
public static boolean worldGuardHookEnabled() {
diff --git a/src/main/java/me/youhavetrouble/preventstabby/commands/HelpCommand.java b/src/main/java/me/youhavetrouble/preventstabby/commands/HelpCommand.java
index 4b69c59..e3faf0f 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/commands/HelpCommand.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/commands/HelpCommand.java
@@ -11,9 +11,7 @@ public class HelpCommand {
public static void help(CommandSender sender, String[] args) {
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
-
List helpPage = new ArrayList<>();
-
helpPage.add(PluginMessages.parseMessage("&b&m &bPreventStabby Help&b&m "));
helpPage.add(PluginMessages.parseMessage("&9/pvp &b&lhelp &f- shows this message"));
if (sender.hasPermission("preventstabby.command.toggle")) {
@@ -22,7 +20,6 @@ public class HelpCommand {
}
String[] helpReady = helpPage.toArray(new String[0]);
sender.sendMessage(helpReady);
-
});
}
diff --git a/src/main/java/me/youhavetrouble/preventstabby/commands/PvpToggleCommand.java b/src/main/java/me/youhavetrouble/preventstabby/commands/PvpToggleCommand.java
index 864e90f..808dd81 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/commands/PvpToggleCommand.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/commands/PvpToggleCommand.java
@@ -11,9 +11,7 @@ import org.bukkit.entity.Player;
public class PvpToggleCommand {
public static void toggle(CommandSender sender, String[] args) {
-
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
-
if (!sender.hasPermission("preventstabby.command.toggle")) {
String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
sender.sendMessage(message);
@@ -47,7 +45,6 @@ public class PvpToggleCommand {
sender.sendMessage(message);
return;
}
-
if (sender instanceof Player) {
Player player = (Player) sender;
if (CombatTimer.isInCombat(player.getUniqueId())) {
diff --git a/src/main/java/me/youhavetrouble/preventstabby/commands/ReloadCommand.java b/src/main/java/me/youhavetrouble/preventstabby/commands/ReloadCommand.java
index aebe782..6daaca0 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/commands/ReloadCommand.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/commands/ReloadCommand.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
public class ReloadCommand {
public static void reload(CommandSender sender) {
-
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
if (!sender.hasPermission("preventstabby.command.reload")) {
String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
@@ -17,7 +16,6 @@ public class ReloadCommand {
}
PreventStabby.getPlugin().reloadPluginConfig(sender);
});
-
}
}
diff --git a/src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java b/src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java
index 7ad5788..a46223c 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java
@@ -85,9 +85,9 @@ public class ConfigCache {
}
};
- configFile.setDescription("PvP toggle that CARES about your pets!");
- configFile.addLink("Spigot", "https://www.spigotmc.org/resources/togglepvp.89376/");
- configFile.addLink("Source", "https://github.com/YouHaveTrouble/TogglePvP");
+ configFile.setDescription("Prevent people from getting stabbed!");
+ configFile.addLink("Spigot", "https://www.spigotmc.org/resources/89376/");
+ configFile.addLink("Source", "https://github.com/YouHaveTrouble/PreventStabby");
configFile.load();
FileConfiguration config = configFile.getConfig();
@@ -135,8 +135,6 @@ public class ConfigCache {
this.entering_combat = config.getString("messages.entering_combat", "&cEntering combat");
this.leaving_combat = config.getString("messages.leaving_combat", "&cLeaving combat");
this.cant_do_that_during_combat = config.getString("messages.cant_do_that_during_combat", "&cYou can't do that while in combat!");
-
-
}
diff --git a/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java b/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
index d7c3978..3a40976 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
@@ -24,7 +24,7 @@ public class WorldGuardHook {
public static void init() {
PreventStabby plugin = PreventStabby.getPlugin();
try {
- Class.forName("com.sk89q.worldguard.protection.flags.registry.FlagConflictException");
+ Class.forName("com.sk89q.worldguard.protection.flags.registry.FlagRegistry");
WorldGuardPlugin worldGuardPlugin = WorldGuardPlugin.inst();
if (WorldGuard.getInstance() == null || worldGuardPlugin == null) return;
plugin.getLogger().info("Hooking into WorldGuard");
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1cf62fe..0c03497 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -12,21 +12,21 @@ commands:
aliases:
- pvp
permissions:
- toglepvp.combatcommandblock.bypass:
+ preventstabby.combatcommandblock.bypass:
default: op
description: Allows to bypass combat command blocker
- toglepvp.combatteleportblock.bypass:
+ preventstabby.combatteleportblock.bypass:
default: op
description: Allows to bypass combat teleport blocker
- togglepvp.command:
+ preventstabby.command:
default: true
description: Allows usage of /pvp command
- togglepvp.command.toggle:
+ preventstabby.command.toggle:
default: true
description: Allows usage of /pvp command
- togglepvp.command.toggle.others:
+ preventstabby.command.toggle.others:
default: op
description: Allows usage of /pvp command
- togglepvp.command.reload:
+ preventstabby.command.reload:
default: op
description: Allows usage of /pvp reload command
\ No newline at end of file