EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-30 16:53:43 +01:00
Code Issues Projects Releases Wiki Activity

And it compiles again!

Browse Source
This commit is contained in:
Shane Freeder
2019-09-26 08:50:33 +01:00
parent fd7bcc4a32
commit c0bfdd34b7
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/commands/ChatNotificationToggleCommand.java
View File

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.commands.CommandUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -21,7 +20,7 @@ public class ChatNotificationToggleCommand implements TabExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (CommandUtils.noConsoleUsage(sender)) { if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
return true; return true;
} }

2
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@@ -287,7 +287,7 @@ public class EntityListener implements Listener {
// Don't process this event for marked entities, for players this is handled above, // Don't process this event for marked entities, for players this is handled above,
// However, for entities, we do not wanna cancel this event to allow plugins to observe changes // However, for entities, we do not wanna cancel this event to allow plugins to observe changes
// properly // properly
if (defender.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() > 0) { if (defender.getMetadata(MetadataConstants.CUSTOM_DAMAGE_METAKEY).size() > 0) {
return; return;
} }

4
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@@ -220,8 +220,8 @@ public class HerbalismManager extends SkillManager {
public void checkDoubleDropsOnBrokenPlants(Player player, Collection<Block> brokenPlants) { public void checkDoubleDropsOnBrokenPlants(Player player, Collection<Block> brokenPlants) {
//Only proceed if skill unlocked and permission enabled //Only proceed if skill unlocked and permission enabled
if (!RankUtils.hasUnlockedSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS) if (!pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS)
|| !Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_DOUBLE_DROPS)) { || !pluginRef.getPermissionTools().isSubSkillEnabled(player, SubSkillType.HERBALISM_DOUBLE_DROPS)) {
return; return;
} }

4
src/main/java/com/gmail/nossr50/util/EventManager.java
View File

@@ -170,9 +170,9 @@ public class EventManager {
return event; return event;
} }
public static McMMOPlayerProfileLoadEvent callPlayerProfileLoadEvent(Player player, PlayerProfile profile){ public McMMOPlayerProfileLoadEvent callPlayerProfileLoadEvent(Player player, PlayerProfile profile){
McMMOPlayerProfileLoadEvent event = new McMMOPlayerProfileLoadEvent(player, profile); McMMOPlayerProfileLoadEvent event = new McMMOPlayerProfileLoadEvent(player, profile);
mcMMO.p.getServer().getPluginManager().callEvent(event); pluginRef.getServer().getPluginManager().callEvent(event);
return event; return event;
} }