Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-20 21:51:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix scoreboards and liquid check

Browse Source
This commit is contained in:
BuildTools 2019-09-29 15:19:32 -06:00
parent 586abfab8d
commit e27b4f86ea
2 changed files with 175 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/songoda/skyblock/listeners/Move.java
View File

@ -101,7 +101,6 @@ public class Move implements Listener {
Island island = islandManager Island island = islandManager
.getIsland(Bukkit.getServer().getOfflinePlayer(playerData.getIsland())); .getIsland(Bukkit.getServer().getOfflinePlayer(playerData.getIsland()));
if (island != null) { if (island != null) {
if (islandManager.isLocationAtIsland(island, to)) { if (islandManager.isLocationAtIsland(island, to)) {
Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml")); Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"));
@ -117,8 +116,7 @@ public class Move implements Listener {
if (configLoad.getBoolean("Island.World." + world.name() + ".Liquid.Enable")) { if (configLoad.getBoolean("Island.World." + world.name() + ".Liquid.Enable")) {
if (to.getY() <= configLoad.getInt("Island.World." + world.name() + ".Liquid.Height")) { if (to.getY() <= configLoad.getInt("Island.World." + world.name() + ".Liquid.Height")) {
if (!configLoad.getBoolean("Island.Liquid.Teleport.Enable")) return; if (keepItemsOnDeath && configLoad.getBoolean("Island.Liquid.Teleport.Enable")) {
if (keepItemsOnDeath) {
player.setFallDistance(0.0F); player.setFallDistance(0.0F);
if (island.hasRole(IslandRole.Member, player.getUniqueId()) if (island.hasRole(IslandRole.Member, player.getUniqueId())
@ -135,7 +133,6 @@ public class Move implements Listener {
soundManager.playSound(player, Sounds.ENDERMAN_TELEPORT.bukkitSound(), 1.0F, soundManager.playSound(player, Sounds.ENDERMAN_TELEPORT.bukkitSound(), 1.0F,
1.0F); 1.0F);
} }
return; return;
} }
} }

8
src/main/java/com/songoda/skyblock/scoreboard/Scoreboard.java
View File

@ -7,6 +7,8 @@ import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandRole; import com.songoda.skyblock.island.IslandRole;
import com.songoda.skyblock.placeholder.PlaceholderManager; import com.songoda.skyblock.placeholder.PlaceholderManager;
import com.songoda.skyblock.utils.NumberUtil; import com.songoda.skyblock.utils.NumberUtil;
import com.songoda.skyblock.utils.version.NMSUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -72,8 +74,8 @@ public class Scoreboard {
String formattedDisplayName = ChatColor.translateAlternateColorCodes('&', String formattedDisplayName = ChatColor.translateAlternateColorCodes('&',
replaceDisplayName(displayName)); replaceDisplayName(displayName));
int max = NMSUtil.getVersionNumber() > 8 ? 32 : 16;
if (formattedDisplayName.length() > 32) { if (formattedDisplayName.length() > max) {
obj.setDisplayName(ChatColor.RED + "Too long..."); obj.setDisplayName(ChatColor.RED + "Too long...");
} else { } else {
obj.setDisplayName(formattedDisplayName); obj.setDisplayName(formattedDisplayName);
@ -101,7 +103,7 @@ public class Scoreboard {
String formattedDisplayName = ChatColor.translateAlternateColorCodes('&', String formattedDisplayName = ChatColor.translateAlternateColorCodes('&',
replaceDisplayName(displayName)); replaceDisplayName(displayName));
if (formattedDisplayName.length() > 32) { if (formattedDisplayName.length() > max) {
obj.setDisplayName(ChatColor.RED + "Too long..."); obj.setDisplayName(ChatColor.RED + "Too long...");
} else { } else {
obj.setDisplayName(formattedDisplayName); obj.setDisplayName(formattedDisplayName);