EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Moved hudType back to PlayerProfile

Browse Source 
Removed some convenient methods from PlayerProfile to avoid NPE because of
spoutHud
This commit is contained in:
bm01
2012-07-07 19:58:51 +02:00
parent 5571e0bc0c
commit ede08ce5ac
6 changed files with 57 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java
View File

@ -30,21 +30,22 @@ public class MchudCommand implements CommandExecutor {
return true;
}
Player player = (Player) sender;
PlayerProfile playerProfile = Users.getProfile(player);
SpoutHud spoutHud = playerProfile.getSpoutHud();
if (spoutHud == null) {
sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
return true;
}
switch (args.length) {
case 1:
Player player = (Player) sender;
PlayerProfile playerProfile = Users.getProfile(player);
for (HudType hudType : HudType.values()) {
if (hudType.toString().equalsIgnoreCase(args[0])) {
playerProfile.setHudType(hudType);
SpoutHud spoutHud = playerProfile.getSpoutHud();
if (spoutHud != null) {
spoutHud.initializeXpBar();
spoutHud.updateXpBar();
}
spoutHud.initializeXpBar();
spoutHud.updateXpBar();
return true;
}
@ -54,7 +55,7 @@ public class MchudCommand implements CommandExecutor {
return true;
default:
sender.sendMessage(usage);
player.sendMessage(usage);
return true;
}
}

23
src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
View File

@ -12,6 +12,7 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.SpoutHud;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
@ -34,20 +35,26 @@ public class XplockCommand implements CommandExecutor {
Player player = (Player) sender;
PlayerProfile playerProfile = Users.getProfile(player);
SpoutHud spoutHud = playerProfile.getSpoutHud();
if (spoutHud == null) {
sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
return true;
}
switch (args.length) {
case 0:
if (playerProfile.getXpBarLocked()) {
playerProfile.toggleXpBarLocked();
if (spoutHud.getXpBarLocked()) {
spoutHud.toggleXpBarLocked();
player.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
return true;
}
SkillType lastGained = playerProfile.getLastGained();
SkillType lastGained = spoutHud.getLastGained();
if (lastGained != null) {
playerProfile.toggleXpBarLocked();
playerProfile.setSkillLock(lastGained);
spoutHud.toggleXpBarLocked();
spoutHud.setSkillLock(lastGained);
player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
}
else {
@ -59,9 +66,9 @@ public class XplockCommand implements CommandExecutor {
case 1:
if (Skills.isSkill(args[0])) {
if (Permissions.getInstance().permission(player, "mcmmo.skills." + args[0].toLowerCase())) {
playerProfile.setXpBarLocked(true);
playerProfile.setSkillLock(Skills.getSkillType(args[0]));
playerProfile.updateXpBar();
spoutHud.setXpBarLocked(true);
spoutHud.setSkillLock(Skills.getSkillType(args[0]));
spoutHud.updateXpBar();
player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(args[0]) }));
}