EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-09-18 10:47:53 +02:00
Code Issues Projects Releases Wiki Activity

Static Abuse Cleanup - EventUtils -> EventManager

Browse Source
This commit is contained in:
nossr50
2019-07-02 18:32:28 -07:00
parent fc9942fdc4
commit 4c4732695b
23 changed files with 92 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@@ -183,7 +183,7 @@ public class FishingManager extends SkillManager {
return false;
}
return EventUtils.simulateBlockBreak(block, player, false);
return pluginRef.getEventManager().simulateBlockBreak(block, player, false);
}
/**
@@ -237,7 +237,7 @@ public class FishingManager extends SkillManager {
}
// Recast in the new spot
EventUtils.callFakeFishEvent(getPlayer(), hook);
pluginRef.getEventManager().callFakeFishEvent(getPlayer(), hook);
}
public void masterAngler(FishHook hook) {
@@ -289,7 +289,7 @@ public class FishingManager extends SkillManager {
enchants = handleMagicHunter(treasureDrop);
}
McMMOPlayerFishingTreasureEvent event = EventUtils.callFishingTreasureEvent(player, treasureDrop, treasure.getXp(), enchants);
McMMOPlayerFishingTreasureEvent event = pluginRef.getEventManager().callFishingTreasureEvent(player, treasureDrop, treasure.getXp(), enchants);
if (!event.isCancelled()) {
treasureDrop = event.getTreasure();

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

@@ -227,7 +227,7 @@ public class HerbalismManager extends SkillManager {
for (HylianTreasure treasure : treasures) {
if (skillLevel >= treasure.getDropLevel()
&& RandomChanceUtil.checkRandomChanceExecutionSuccess(new RandomChanceSkillStatic(treasure.getDropChance(), getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK))) {
if (!EventUtils.simulateBlockBreak(blockState.getBlock(), player, false)) {
if (!pluginRef.getEventManager().simulateBlockBreak(blockState.getBlock(), player, false)) {
return false;
}
blockState.setType(Material.AIR);

4
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@@ -10,7 +10,7 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
import com.gmail.nossr50.runnables.skills.AbilityCooldownTask;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.EventManager;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.random.RandomChanceUtil;
@@ -111,7 +111,7 @@ public class MiningManager extends SkillManager {
Block targetBlock = player.getTargetBlock(BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE);
//Blast mining cooldown check needs to be first so the player can be messaged
if (!blastMiningCooldownOver() || targetBlock.getType() != Material.TNT || !EventUtils.simulateBlockBreak(targetBlock, player, true)) {
if (!blastMiningCooldownOver() || targetBlock.getType() != Material.TNT || !pluginRef.getEventManager().simulateBlockBreak(targetBlock, player, true)) {
return;
}

4
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
View File

@@ -6,7 +6,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.EventManager;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.StringUtils;
@@ -130,7 +130,7 @@ public class SalvageManager extends SkillManager {
ItemStack salvageResults = new ItemStack(salvageable.getSalvagedItemMaterial(), lotteryResults);
//Call event
if (EventUtils.callSalvageCheckEvent(player, item, salvageResults, enchantBook).isCancelled()) {
if (pluginRef.getEventManager().callSalvageCheckEvent(player, item, salvageResults, enchantBook).isCancelled()) {
return;
}

4
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@@ -8,7 +8,7 @@ import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
import com.gmail.nossr50.datatypes.skills.ToolType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.EventManager;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
@@ -95,7 +95,7 @@ public class UnarmedManager extends SkillManager {
*/
public void disarmCheck(Player defender) {
if (RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.UNARMED_DISARM, getPlayer()) && !hasIronGrip(defender)) {
if (EventUtils.callDisarmEvent(defender).isCancelled()) {
if (pluginRef.getEventManager().callDisarmEvent(defender).isCancelled()) {
return;
}

2
src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java
View File

@@ -117,7 +117,7 @@ public class WoodcuttingManager extends SkillManager {
for (BlockState blockState : treeFellerBlocks) {
Block block = blockState.getBlock();
if (!EventUtils.simulateBlockBreak(block, player, true)) {
if (!pluginRef.getEventManager().simulateBlockBreak(block, player, true)) {
break; // TODO: Shouldn't we use continue instead?
}