Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 08:09:39 +01:00
Code Issues Projects Releases Wiki Activity

Squashing some final compiler errors from static abuse removal

Browse Source
This commit is contained in:
nossr50 2019-09-25 14:31:48 -07:00
parent 8ad08298d0
commit e8f14eece0
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
View File

@ -68,7 +68,7 @@ public class PartyInfoCommand implements CommandExecutor {
List<String> lockedPartyFeatures = new ArrayList<>(); List<String> lockedPartyFeatures = new ArrayList<>();
for (PartyFeature partyFeature : PartyFeature.values()) { for (PartyFeature partyFeature : PartyFeature.values()) {
if (!partyFeature.hasPermission(player)) { if (!partyFeature.hasPermission(pluginRef, player)) {
continue; continue;
} }

4
src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java
View File

@ -246,7 +246,7 @@ public class ConfigLeveling {
case SALVAGE: case SALVAGE:
return configSectionLevelCaps.getConfigSectionSkillLevelCaps().getSalvage().getLevelCap(); return configSectionLevelCaps.getConfigSectionSkillLevelCaps().getSalvage().getLevelCap();
default: default:
pluginRef.getLogger().severe("No defined level cap for " + primarySkillType.toString() + " - Contact the mcMMO dev team!"); System.out.println(("[mcMMO Debug LevelingConfig] No defined level cap for " + primarySkillType.toString() + " - Contact the mcMMO dev team!"));
return Integer.MAX_VALUE; return Integer.MAX_VALUE;
} }
} }
@ -284,7 +284,7 @@ public class ConfigLeveling {
case SALVAGE: case SALVAGE:
return configSectionLevelCaps.getConfigSectionSkillLevelCaps().getSalvage().isLevelCapEnabled(); return configSectionLevelCaps.getConfigSectionSkillLevelCaps().getSalvage().isLevelCapEnabled();
default: default:
pluginRef.getLogger().severe("No defined level cap for " + primarySkillType.toString() + " - Contact the mcMMO dev team!"); System.out.println(("[mcMMO Debug LevelingConfig] No defined level cap for " + primarySkillType.toString() + " - Contact the mcMMO dev team!"));
return false; return false;
} }
} }

4
src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java
View File

@ -1,6 +1,7 @@
package com.gmail.nossr50.datatypes.party; package com.gmail.nossr50.datatypes.party;
import com.gmail.nossr50.commands.party.PartySubcommandType; import com.gmail.nossr50.commands.party.PartySubcommandType;
import com.gmail.nossr50.mcMMO;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public enum PartyFeature { public enum PartyFeature {
@ -10,7 +11,8 @@ public enum PartyFeature {
ITEM_SHARE, ITEM_SHARE,
XP_SHARE; XP_SHARE;
public boolean hasPermission(Player player) { //TODO: hacky...
public boolean hasPermission(mcMMO pluginRef, Player player) {
PartySubcommandType partySubCommandType; PartySubcommandType partySubCommandType;
switch (this) { switch (this) {
case CHAT: case CHAT:

3
src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java
View File

@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable { public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable {
private SubSkillType subSkillType; private final SubSkillType subSkillType;
private boolean cancelled = false; private boolean cancelled = false;
/** /**
@ -26,6 +26,7 @@ public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable
public SubSkillEvent(Player player, AbstractSubSkill abstractSubSkill) { public SubSkillEvent(Player player, AbstractSubSkill abstractSubSkill) {
super(player, abstractSubSkill.getPrimarySkill()); super(player, abstractSubSkill.getPrimarySkill());
this.subSkillType = abstractSubSkill.getSubSkillType();
} }
/** /**

6
src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java
View File

@ -1,5 +1,6 @@
package com.gmail.nossr50.events.skills.secondaryabilities; package com.gmail.nossr50.events.skills.secondaryabilities;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -7,8 +8,9 @@ import org.bukkit.entity.Player;
public class SubSkillRandomCheckEvent extends SubSkillEvent { public class SubSkillRandomCheckEvent extends SubSkillEvent {
private double chance; private double chance;
public SubSkillRandomCheckEvent(Player player, SubSkillType ability, double chance) { @Deprecated
super(player, ability); public SubSkillRandomCheckEvent(Player player, SubSkillType subSkillType, double chance, PrimarySkillType primarySkillType) {
super(player, subSkillType, primarySkillType);
this.chance = chance; this.chance = chance;
} }

2
src/main/java/com/gmail/nossr50/util/MobHealthBarManager.java
View File

@ -80,7 +80,7 @@ public final class MobHealthBarManager {
target.setMetadata(MetadataConstants.NAME_VISIBILITY_METAKEY, new FixedMetadataValue(pluginRef, false)); target.setMetadata(MetadataConstants.NAME_VISIBILITY_METAKEY, new FixedMetadataValue(pluginRef, false));
} }
new MobHealthDisplayUpdaterTask(target).runTaskLater(pluginRef, displayTime * pluginRef.getMiscTools().TICK_CONVERSION_FACTOR); // Clear health display after 3 seconds new MobHealthDisplayUpdaterTask(pluginRef, target).runTaskLater(pluginRef, displayTime * pluginRef.getMiscTools().TICK_CONVERSION_FACTOR); // Clear health display after 3 seconds
} }
} }

2
src/main/java/com/gmail/nossr50/util/random/RandomChanceTools.java
View File

@ -230,7 +230,7 @@ public class RandomChanceTools {
} }
public boolean sendSkillEvent(Player player, SubSkillType subSkillType, double activationChance) { public boolean sendSkillEvent(Player player, SubSkillType subSkillType, double activationChance) {
SubSkillRandomCheckEvent event = new SubSkillRandomCheckEvent(player, subSkillType, activationChance); SubSkillRandomCheckEvent event = new SubSkillRandomCheckEvent(player, subSkillType, activationChance, pluginRef.getSkillTools().getPrimarySkillBySubSkill(subSkillType));
return !event.isCancelled(); return !event.isCancelled();
} }