From fcf26df82ee14ca9b8ef217fa98414cde72abb08 Mon Sep 17 00:00:00 2001 From: Joshua Date: Fri, 12 Feb 2021 10:37:15 -0600 Subject: [PATCH] Latest Mythiclib 1.0.2 --- pom.xml | 2 +- .../mmocore/command/FriendsCommand.java | 17 +++++----- .../mmocore/listener/BlockListener.java | 32 ++++++++----------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index b3b1c581..bfd90018 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ io.lumine MythicLib - 1.0.0 + 1.0.2 provided diff --git a/src/main/java/net/Indyuce/mmocore/command/FriendsCommand.java b/src/main/java/net/Indyuce/mmocore/command/FriendsCommand.java index 7c72c85b..e4ad152e 100644 --- a/src/main/java/net/Indyuce/mmocore/command/FriendsCommand.java +++ b/src/main/java/net/Indyuce/mmocore/command/FriendsCommand.java @@ -1,14 +1,5 @@ package net.Indyuce.mmocore.command; -import java.util.UUID; - -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.command.defaults.BukkitCommand; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.entity.Player; - import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.event.MMOCommandEvent; import net.Indyuce.mmocore.api.player.OfflinePlayerData; @@ -16,6 +7,14 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.social.FriendRequest; import net.Indyuce.mmocore.api.player.social.Request; import net.Indyuce.mmocore.manager.InventoryManager; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.command.defaults.BukkitCommand; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.entity.Player; + +import java.util.UUID; public class FriendsCommand extends BukkitCommand { public FriendsCommand(ConfigurationSection config) { diff --git a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java index 43a6936f..4ae8a6ec 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java @@ -1,35 +1,26 @@ package net.Indyuce.mmocore.listener; +import io.lumine.mythic.lib.UtilityMethods; import io.lumine.mythic.utils.Schedulers; -import org.bukkit.Bukkit; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Statistic; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.block.BlockInfo; +import net.Indyuce.mmocore.api.block.BlockInfo.BlockInfoOption; +import net.Indyuce.mmocore.api.block.VanillaBlockType; +import net.Indyuce.mmocore.api.event.CustomBlockMineEvent; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.util.MMOCoreUtils; +import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockFormEvent; -import org.bukkit.event.block.BlockPistonExtendEvent; -import org.bukkit.event.block.BlockPistonRetractEvent; -import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.block.*; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.block.BlockInfo; -import net.Indyuce.mmocore.api.block.VanillaBlockType; -import net.Indyuce.mmocore.api.block.BlockInfo.BlockInfoOption; -import net.Indyuce.mmocore.api.event.CustomBlockMineEvent; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import io.lumine.mythic.lib.UtilityMethods; - public class BlockListener implements Listener { private static final BlockFace[] order = { BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH }; @@ -146,8 +137,11 @@ public class BlockListener implements Listener { @EventHandler(priority = EventPriority.HIGH) public void registerPlayerPlacedBlocksTag(BlockPlaceEvent event) { event.getBlock().setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true)); + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void blockPistonExtend(BlockPistonExtendEvent event) { Block movedBlock = event.getBlock();