EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix formatting

Browse Source 
(cherry picked from commit 4e36073e6e2dc3aeba087d605cef79fc4a8a9779)
This commit is contained in:
TfT_02 2014-04-14 15:11:58 +02:00
parent b204507a82
commit bfebbd0095
2 changed files with 104 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
View File

@ -7,7 +7,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
@ -81,14 +80,16 @@ public class ScoreboardManager {
skillLabelBuilder.put(type, colors.get(i) + type.getName());
if (type.getAbility() != null) {
abilityLabelBuilder.put(type.getAbility(),colors.get(i) + type.getAbility().getName());
abilityLabelBuilder.put(type.getAbility(), colors.get(i) + type.getAbility().getName());
if (type == SkillType.MINING) {
abilityLabelBuilder.put(AbilityType.BLAST_MINING, colors.get(i) + AbilityType.BLAST_MINING.getName());
}
}
if (++i == colors.size()) i = 0;
if (++i == colors.size()) {
i = 0;
}
}
}
else {
@ -335,7 +336,7 @@ public class ScoreboardManager {
/**
* Gets or creates the power level objective on the main scoreboard.
* <p>
* <p/>
* If power levels are disabled, the objective is deleted and null is
* returned.
*

13
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java
View File

@ -28,7 +28,6 @@ import com.gmail.nossr50.util.scoreboards.ScoreboardManager.SidebarType;
import org.apache.commons.lang.Validate;
public class ScoreboardWrapper {
// Initialization variables
public final String playerName;
private final Scoreboard scoreboard;
@ -69,6 +68,7 @@ public class ScoreboardWrapper {
}
public BukkitTask updateTask = null;
private class ScoreboardQuickUpdate extends BukkitRunnable {
@Override
public void run() {
@ -78,6 +78,7 @@ public class ScoreboardWrapper {
}
public BukkitTask revertTask = null;
private class ScoreboardChangeTask extends BukkitRunnable {
@Override
public void run() {
@ -87,6 +88,7 @@ public class ScoreboardWrapper {
}
public BukkitTask cooldownTask = null;
private class ScoreboardCooldownTask extends BukkitRunnable {
@Override
public void run() {
@ -121,7 +123,8 @@ public class ScoreboardWrapper {
try {
cooldownTask.cancel();
}
catch (Throwable ignored) {}
catch (Throwable ignored) {
}
cooldownTask = null;
}
@ -381,7 +384,8 @@ public class ScoreboardWrapper {
try {
updateTask.cancel();
}
catch (Throwable ignored) {} // catch NullPointerException and IllegalStateException and any Error; don't care
catch (Throwable ignored) {
} // catch NullPointerException and IllegalStateException and any Error; don't care
updateTask = null;
@ -493,8 +497,9 @@ public class ScoreboardWrapper {
for (SkillType skill : SkillType.values()) { // Include child skills, but not in power level
int level = newProfile.getSkillLevel(skill);
if (!skill.isChildSkill())
if (!skill.isChildSkill()) {
powerLevel += level;
}
// TODO: Verify that this is what we want - calculated in power level but not displayed
if (!skill.getPermissions(player)) {