Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-29 21:53:42 +01:00
Code Issues Projects Releases Wiki Activity

Bug Fixes

Browse Source 
# Fixed comments in the 'config.yml' file creating a new line rather than remaining on the same line.
# Fixed ISE when performing the command '/island' or '/is'.
# Fixed the displayname on the scoreboard not updating.
# Fixed a word mistake in the 'language.yml' file.
This commit is contained in:
Unknown 2018-11-25 02:06:50 +00:00
parent 8ae37cf7a6
commit 5ef076bda9
6 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
language.yml
View File

@ -236,7 +236,7 @@ Command:
Message: "&bSkyBlock &8| &aInfo&8: &eYou have been demoted to a &dMember&e." Message: "&bSkyBlock &8| &aInfo&8: &eYou have been demoted to a &dMember&e."
Vote: Vote:
Info: Info:
Message: "Add/Remove a vote for a players Island." Message: "Add/Remove a vote from a players Island."
Invalid: Invalid:
Message: "&bSkyBlock &8| &cError&8: &eInvalid: /island vote <player>" Message: "&bSkyBlock &8| &cError&8: &eInvalid: /island vote <player>"
Disabled: Disabled:

2
plugin.yml
View File

@ -1,6 +1,6 @@
name: SkyBlock name: SkyBlock
main: me.goodandevil.skyblock.Main main: me.goodandevil.skyblock.Main
version: 25 version: 26
api-version: 1.13 api-version: 1.13
description: A unique SkyBlock plugin description: A unique SkyBlock plugin
author: GoodAndEvil author: GoodAndEvil

5
src/me/goodandevil/skyblock/command/CommandManager.java
View File

@ -160,8 +160,13 @@ public class CommandManager implements CommandExecutor, TabCompleter {
ControlPanel.getInstance().open(player); ControlPanel.getInstance().open(player);
soundManager.playSound(player, Sounds.CHEST_OPEN.bukkitSound(), 1.0F, 1.0F); soundManager.playSound(player, Sounds.CHEST_OPEN.bukkitSound(), 1.0F, 1.0F);
} else { } else {
Bukkit.getServer().getScheduler().runTask(plugin, new Runnable() {
@Override
public void run() {
Bukkit.getServer().dispatchCommand(player, "island create"); Bukkit.getServer().dispatchCommand(player, "island create");
} }
});
}
return; return;
} }

2
src/me/goodandevil/skyblock/command/commands/VoteCommand.java
View File

@ -86,7 +86,7 @@ public class VoteCommand extends SubCommand {
if (island.isRole(Role.Member, player.getUniqueId()) || island.isRole(Role.Operator, player.getUniqueId()) || island.isRole(Role.Owner, player.getUniqueId())) { if (island.isRole(Role.Member, player.getUniqueId()) || island.isRole(Role.Operator, player.getUniqueId()) || island.isRole(Role.Owner, player.getUniqueId())) {
messageManager.sendMessage(player, configLoad.getString("Command.Island.Vote.Island.Member.Message")); messageManager.sendMessage(player, configLoad.getString("Command.Island.Vote.Island.Member.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F); soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
} else if (!playerDataManager.hasPlayerData(player)) { } else if (playerDataManager.hasPlayerData(player)) {
PlayerData playerData = playerDataManager.getPlayerData(player); PlayerData playerData = playerDataManager.getPlayerData(player);
if (playerData.getIsland() != null && playerData.getIsland().equals(island.getOwnerUUID())) { if (playerData.getIsland() != null && playerData.getIsland().equals(island.getOwnerUUID())) {

2
src/me/goodandevil/skyblock/config/FileManager.java
View File

@ -204,7 +204,7 @@ public class FileManager {
for(String line : lines) { for(String line : lines) {
if(line.contains(plugin.getDescription().getName() + "_COMMENT")) { if(line.contains(plugin.getDescription().getName() + "_COMMENT")) {
config.append(line.replace("IMPORTANT", "[!]").replace("\n", "").replace(plugin.getDescription().getName() + "_COMMENT_", "#").replaceAll("[0-9]+:", "") + "\n"); config.append(line.replace("IMPORTANT", "[!]").replace("\n", "").replace(plugin.getDescription().getName() + "_COMMENT_", "#").replaceAll("[0-9]+:", "") + "\n");
} else { } else if (line.contains(":")) {
config.append(line + "\n"); config.append(line + "\n");
} }
} }

14
src/me/goodandevil/skyblock/scoreboard/Scoreboard.java
View File

@ -73,12 +73,12 @@ public class Scoreboard {
obj.setDisplaySlot(DisplaySlot.SIDEBAR); obj.setDisplaySlot(DisplaySlot.SIDEBAR);
String formatteddisplayName = ChatColor.translateAlternateColorCodes('&', replaceDisplayName(displayName)); String formattedDisplayName = ChatColor.translateAlternateColorCodes('&', replaceDisplayName(displayName));
if (formatteddisplayName.length() > 32) { if (formattedDisplayName.length() > 32) {
obj.setDisplayName(ChatColor.RED + "Too long..."); obj.setDisplayName(ChatColor.RED + "Too long...");
} else { } else {
obj.setDisplayName(formatteddisplayName); obj.setDisplayName(formattedDisplayName);
} }
for (int i = 0; i < ChatColor.values().length; i++) { for (int i = 0; i < ChatColor.values().length; i++) {
@ -99,6 +99,14 @@ public class Scoreboard {
public void run() { public void run() {
if (player.isOnline()) { if (player.isOnline()) {
try { try {
String formattedDisplayName = ChatColor.translateAlternateColorCodes('&', replaceDisplayName(displayName));
if (formattedDisplayName.length() > 32) {
obj.setDisplayName(ChatColor.RED + "Too long...");
} else {
obj.setDisplayName(formattedDisplayName);
}
for (String displayLine : displayList) { for (String displayLine : displayList) {
i1--; i1--;