diff options
author | David Panić <david@panic.tk> | 2019-04-17 20:46:21 +0200 |
---|---|---|
committer | David Panić <david@panic.tk> | 2019-04-17 20:46:21 +0200 |
commit | 62cf62adc3b3b2d5c11cf1a144e49e98a0bedced (patch) | |
tree | 1c2d99844ae3a2a081b4950b67b305e348d5ccf6 /src/main/java | |
parent | 3169fa20a2770c4b80df59b5ac54346f91230a77 (diff) | |
parent | f626609115dd0beca3d81bf1289690bee945a9e5 (diff) |
Merge branch 'dev'
Diffstat (limited to 'src/main/java')
4 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/com/redstoner/modules/chat/Chat.cmd b/src/main/java/com/redstoner/modules/chat/Chat.cmd index a93763c..112a6f2 100644 --- a/src/main/java/com/redstoner/modules/chat/Chat.cmd +++ b/src/main/java/com/redstoner/modules/chat/Chat.cmd @@ -84,7 +84,7 @@ command chatonly { perm utils.chat.chatonly; [empty] { run chatonly; - help Shows that you're onlu able to chat, nothing else.; + help Shows that you're only able to chat, nothing else.; type player; } } diff --git a/src/main/java/com/redstoner/modules/damnspam/DamnSpam.java b/src/main/java/com/redstoner/modules/damnspam/DamnSpam.java index c9e1777..2f85d11 100644 --- a/src/main/java/com/redstoner/modules/damnspam/DamnSpam.java +++ b/src/main/java/com/redstoner/modules/damnspam/DamnSpam.java @@ -39,7 +39,7 @@ import com.redstoner.modules.Module; @Commands(CommandHolderType.File) @AutoRegisterListener -@Version(major = 5, minor = 0, revision = 0, compatible = 4) +@Version(major = 5, minor = 0, revision = 1, compatible = 4) public class DamnSpam implements Module, Listener { File configFile = new File(Main.plugin.getDataFolder(), "DamnSpam.json"); @@ -249,7 +249,7 @@ public class DamnSpam implements Module, Listener { Player sender = event.getPlayer(); String typeStr = block.getType().toString().toLowerCase().replace("_", " "); - String inputStr = (block.getLocation().equals(event.getBlock()) ? "this " + typeStr : "the " + typeStr + " attached to that block"); + String inputStr = (block.getLocation().equals(event.getBlock().getLocation()) ? "this " + typeStr : "the " + typeStr + " attached to that block"); if (!sender.isSneaking()) { getLogger().message(sender, true, "You cannot destroy " + inputStr); diff --git a/src/main/java/com/redstoner/modules/discord/Discord.java b/src/main/java/com/redstoner/modules/discord/Discord.java index cdef453..63d6a74 100644 --- a/src/main/java/com/redstoner/modules/discord/Discord.java +++ b/src/main/java/com/redstoner/modules/discord/Discord.java @@ -25,7 +25,7 @@ import com.redstoner.modules.Module; import net.nemez.chatapi.click.Message; @Commands(CommandHolderType.File) -@Version(major = 5, minor = 0, revision = 2, compatible = 4) +@Version(major = 5, minor = 0, revision = 3, compatible = 4) public class Discord implements Module { private MysqlTable table; @@ -115,7 +115,7 @@ public class Discord implements Module { } new Message(sender, null).appendText("\n&cRedstoner&7 has a &2Discord&7 Now! \nClick ") - .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync you rank, copy ") + .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync your rank, copy ") .appendSuggestHover("&e" + token, token, "&aClick to Copy").appendText("&7 into &3#rank-sync&7.\n").send(); } diff --git a/src/main/java/com/redstoner/modules/survival/Survival.java b/src/main/java/com/redstoner/modules/survival/Survival.java index 87a0f36..5bbf500 100644 --- a/src/main/java/com/redstoner/modules/survival/Survival.java +++ b/src/main/java/com/redstoner/modules/survival/Survival.java @@ -20,15 +20,12 @@ import com.redstoner.misc.Main; import com.redstoner.modules.Module; import com.redstoner.modules.datamanager.DataManager; -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.TextComponent; import net.nemez.chatapi.ChatAPI; @Commands(CommandHolderType.File) @AutoRegisterListener -@Version(major = 5, minor = 0, revision = 7, compatible = 4) +@Version(major = 5, minor = 0, revision = 8, compatible = 4) public class Survival implements Module, Listener { - @EventHandler public void onPlayerTeleport(PlayerTeleportEvent e) { if (e.getPlayer().getGameMode() != GameMode.SURVIVAL) |