mirror of
https://gitlab.com/phoenix-dvpmt/mmocore.git
synced 2024-10-22 20:10:00 +02:00
fixed #252 double drops
This commit is contained in:
Indyuce
parent
e9b417f191
commit
c1a98bc5a5
@ -1,33 +1,33 @@
|
||||
package net.Indyuce.mmocore.api.droptable.dropitem;
|
||||
|
||||
import org.apache.commons.lang.Validate;
|
||||
|
||||
import io.lumine.mythic.lib.api.MMOLineConfig;
|
||||
import net.Indyuce.mmocore.MMOCore;
|
||||
import net.Indyuce.mmocore.api.droptable.DropTable;
|
||||
import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
|
||||
import net.Indyuce.mmocore.api.loot.LootBuilder;
|
||||
import net.Indyuce.mmocore.api.player.PlayerData;
|
||||
import io.lumine.mythic.lib.api.MMOLineConfig;
|
||||
import org.apache.commons.lang.Validate;
|
||||
|
||||
public class DropTableDropItem extends DropItem {
|
||||
private final DropTable dropTable;
|
||||
private final DropTable dropTable;
|
||||
|
||||
public DropTableDropItem(MMOLineConfig config) {
|
||||
super(config);
|
||||
public DropTableDropItem(MMOLineConfig config) {
|
||||
super(config);
|
||||
|
||||
config.validate("id");
|
||||
String id = config.getString("id");
|
||||
config.validate("id");
|
||||
String id = config.getString("id");
|
||||
|
||||
Validate.isTrue(MMOCore.plugin.dropTableManager.has(id), "Could not find drop table " + id);
|
||||
this.dropTable = MMOCore.plugin.dropTableManager.get(id);
|
||||
}
|
||||
Validate.isTrue(MMOCore.plugin.dropTableManager.has(id), "Could not find drop table " + id);
|
||||
this.dropTable = MMOCore.plugin.dropTableManager.get(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void collect(LootBuilder builder) {
|
||||
PlayerData data = builder.getEntity();
|
||||
if(!data.isOnline()) return;
|
||||
if (dropTable.areConditionsMet(new ConditionInstance(data.getPlayer())))
|
||||
for (int j = 0; j < rollAmount(); j++)
|
||||
builder.addLoot(dropTable.collect(builder));
|
||||
}
|
||||
@Override
|
||||
public void collect(LootBuilder builder) {
|
||||
PlayerData data = builder.getEntity();
|
||||
if (!data.isOnline()) return;
|
||||
|
||||
if (dropTable.areConditionsMet(new ConditionInstance(data.getPlayer())))
|
||||
for (int j = 0; j < rollAmount(); j++)
|
||||
dropTable.collect(builder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,25 +1,5 @@
|
||||
package net.Indyuce.mmocore.listener;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Statistic;
|
||||
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.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
|
||||
import io.lumine.mythic.lib.UtilityMethods;
|
||||
import io.lumine.mythic.utils.Schedulers;
|
||||
import net.Indyuce.mmocore.MMOCore;
|
||||
@ -28,200 +8,212 @@ import net.Indyuce.mmocore.api.block.BlockInfo.BlockInfoOption;
|
||||
import net.Indyuce.mmocore.api.block.VanillaBlockType;
|
||||
import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
|
||||
import net.Indyuce.mmocore.api.event.CustomBlockMineEvent;
|
||||
import net.Indyuce.mmocore.api.loot.LootBuilder;
|
||||
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.*;
|
||||
import org.bukkit.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockListener implements Listener {
|
||||
private static final BlockFace[] order = { BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH };
|
||||
private static final BlockFace[] order = {BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
|
||||
public void onCustomBreak(BlockBreakEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (player.getGameMode() == GameMode.CREATIVE)
|
||||
return;
|
||||
@SuppressWarnings("deprecation")
|
||||
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
|
||||
public void onCustomBreak(BlockBreakEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (player.getGameMode() == GameMode.CREATIVE)
|
||||
return;
|
||||
|
||||
String savedData = event.getBlock().getBlockData().getAsString();
|
||||
Block block = event.getBlock();
|
||||
String savedData = event.getBlock().getBlockData().getAsString();
|
||||
Block block = event.getBlock();
|
||||
|
||||
/*
|
||||
* Check for custom mining in the current region first.
|
||||
*/
|
||||
boolean customMine = MMOCore.plugin.mineManager.isEnabled(player, block.getLocation());
|
||||
if (!customMine)
|
||||
return;
|
||||
/*
|
||||
* Check for custom mining in the current region first.
|
||||
*/
|
||||
boolean customMine = MMOCore.plugin.mineManager.isEnabled(player, block.getLocation());
|
||||
if (!customMine)
|
||||
return;
|
||||
|
||||
/*
|
||||
* If the block is a temporary block placed by block regen, immediately
|
||||
* cancel the break event; also check for extra config provided block
|
||||
* conditions
|
||||
*/
|
||||
BlockInfo info = MMOCore.plugin.mineManager.getInfo(block);
|
||||
boolean temporaryBlock = MMOCore.plugin.mineManager.isTemporaryBlock(block);
|
||||
if ((temporaryBlock && info == null) || (info != null && !info.checkConditions(block))) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* If the block is a temporary block placed by block regen, immediately
|
||||
* cancel the break event; also check for extra config provided block
|
||||
* conditions
|
||||
*/
|
||||
BlockInfo info = MMOCore.plugin.mineManager.getInfo(block);
|
||||
boolean temporaryBlock = MMOCore.plugin.mineManager.isTemporaryBlock(block);
|
||||
if ((temporaryBlock && info == null) || (info != null && !info.checkConditions(block))) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
if (info == null) {
|
||||
if (info == null) {
|
||||
|
||||
/*
|
||||
* If players are prevented from breaking blocks in custom mining
|
||||
* regions
|
||||
*/
|
||||
if (MMOCore.plugin.mineManager.shouldProtect())
|
||||
event.setCancelled(true);
|
||||
/*
|
||||
* If players are prevented from breaking blocks in custom mining
|
||||
* regions
|
||||
*/
|
||||
if (MMOCore.plugin.mineManager.shouldProtect())
|
||||
event.setCancelled(true);
|
||||
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* Extra breaking conditions.
|
||||
*/
|
||||
if (!info.getBlock().breakRestrictions(block)) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Extra breaking conditions.
|
||||
*/
|
||||
if (!info.getBlock().breakRestrictions(block)) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
boolean canBreak = true;
|
||||
ItemStack item = player.getInventory().getItemInMainHand();
|
||||
if (!MMOCore.plugin.restrictionManager.checkPermissions(item, info.getBlock())) {
|
||||
MMOCore.plugin.configManager.getSimpleMessage("cannot-break").send(player);
|
||||
canBreak = false;
|
||||
}
|
||||
boolean canBreak = true;
|
||||
ItemStack item = player.getInventory().getItemInMainHand();
|
||||
if (!MMOCore.plugin.restrictionManager.checkPermissions(item, info.getBlock())) {
|
||||
MMOCore.plugin.configManager.getSimpleMessage("cannot-break").send(player);
|
||||
canBreak = false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Calls the event and listen for cancel & for drops changes... also
|
||||
* allows to apply tool durability & enchants to drops, etc.
|
||||
*/
|
||||
CustomBlockMineEvent called = new CustomBlockMineEvent(PlayerData.get(player), block, info, canBreak);
|
||||
Bukkit.getPluginManager().callEvent(called);
|
||||
/*
|
||||
* Find the block drops
|
||||
*/
|
||||
boolean conditionsMet = !info.hasDropTable() || info.getDropTable().areConditionsMet(new ConditionInstance(player));
|
||||
List<ItemStack> drops = conditionsMet ? info.getDropTable().collect(new LootBuilder(PlayerData.get(player), 0)) : new ArrayList<>();
|
||||
|
||||
if (called.isCancelled() || !called.canBreak()) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Calls the event and listen for cancel & for drops changes... also
|
||||
* allows to apply tool durability & enchants to drops, etc.
|
||||
*/
|
||||
CustomBlockMineEvent called = new CustomBlockMineEvent(PlayerData.get(player), block, info, drops, !canBreak);
|
||||
Bukkit.getPluginManager().callEvent(called);
|
||||
if (called.isCancelled()) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* Remove vanilla drops if needed and
|
||||
* decreases the durability of the item
|
||||
* used to mine the block.
|
||||
*/
|
||||
if (!info.getOption(BlockInfoOption.VANILLA_DROPS)) {
|
||||
event.setCancelled(true);
|
||||
event.getBlock().setType(Material.AIR);
|
||||
MMOCoreUtils.decreaseDurability(player, EquipmentSlot.HAND, 1);
|
||||
}
|
||||
/*
|
||||
* Remove vanilla drops if needed and
|
||||
* decreases the durability of the item
|
||||
* used to mine the block.
|
||||
*/
|
||||
if (!info.getOption(BlockInfoOption.VANILLA_DROPS)) {
|
||||
event.setCancelled(true);
|
||||
event.getBlock().setType(Material.AIR);
|
||||
MMOCoreUtils.decreaseDurability(player, EquipmentSlot.HAND, 1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Apply triggers, add experience info to the event so the other events
|
||||
* can give exp to other TOOLS and display HOLOGRAMS
|
||||
*/
|
||||
if (info.hasTriggers() && !block.hasMetadata("player_placed")) {
|
||||
if (!info.hasDropTable() || info.hasDropTable() && info.getDropTable().areConditionsMet(new ConditionInstance(player))) {
|
||||
PlayerData playerData = PlayerData.get(player);
|
||||
info.getTriggers().forEach(trigger -> trigger.apply(playerData));
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Apply triggers, add experience info to the event so the other events
|
||||
* can give exp to other TOOLS and display HOLOGRAMS
|
||||
*/
|
||||
if (conditionsMet && info.hasTriggers() && !block.hasMetadata("player_placed")) {
|
||||
PlayerData playerData = PlayerData.get(player);
|
||||
info.getTriggers().forEach(trigger -> trigger.apply(playerData));
|
||||
}
|
||||
|
||||
/*
|
||||
* Apply drop tables
|
||||
*/
|
||||
if (info.hasDropTable()) {
|
||||
Location dropLocation = getSafeDropLocation(block,
|
||||
!block.getType().isSolid() || !(info.regenerates() && info.getRegenerationInfo().hasTemporaryBlock()));
|
||||
for (ItemStack drop : called.getDrops())
|
||||
if (drop.getType() != Material.AIR && drop.getAmount() > 0)
|
||||
UtilityMethods.dropItemNaturally(dropLocation, drop);
|
||||
}
|
||||
/*
|
||||
* Apply drop tables
|
||||
*
|
||||
* You can apply the drop tables even if the block was placed by a player.
|
||||
*/
|
||||
if (conditionsMet && info.hasDropTable()) {
|
||||
Location dropLocation = getSafeDropLocation(block, !block.getType().isSolid() || !(info.regenerates() && info.getRegenerationInfo().hasTemporaryBlock()));
|
||||
for (ItemStack drop : drops)
|
||||
if (drop.getType() != Material.AIR && drop.getAmount() > 0)
|
||||
UtilityMethods.dropItemNaturally(dropLocation, drop);
|
||||
}
|
||||
|
||||
/*
|
||||
* Finally enable block regen.
|
||||
*/
|
||||
if (info.hasRegen()) {
|
||||
Schedulers.sync().runLater(()-> {
|
||||
MMOCore.plugin.mineManager.initialize(info.startRegeneration(Bukkit.createBlockData(savedData), block.getLocation()), !temporaryBlock);
|
||||
}, 1);
|
||||
/*
|
||||
* Finally enable block regen.
|
||||
*/
|
||||
if (info.hasRegen())
|
||||
Schedulers.sync().runLater(() -> MMOCore.plugin.mineManager.initialize(info.startRegeneration(Bukkit.createBlockData(savedData), block.getLocation()), !temporaryBlock), 1);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
* This is handled in a separate event because it
|
||||
* needs to happen AFTER it's already checked the tag
|
||||
*/
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void unregisterPlayerPlacedBlocksTag(BlockBreakEvent event) {
|
||||
if (event.getBlock().hasMetadata("player_placed"))
|
||||
event.getBlock().removeMetadata("player_placed", MMOCore.plugin);
|
||||
}
|
||||
|
||||
/*
|
||||
* This is handled in a separate event because it
|
||||
* needs to happen AFTER it's already checked the tag
|
||||
*/
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void unregisterPlayerPlacedBlocksTag(BlockBreakEvent event) {
|
||||
if(event.getBlock().hasMetadata("player_placed"))
|
||||
event.getBlock().removeMetadata("player_placed", MMOCore.plugin);
|
||||
}
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void registerPlayerPlacedBlocksTag(BlockPlaceEvent event) {
|
||||
event.getBlock().setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
|
||||
@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();
|
||||
if (!movedBlock.hasMetadata("player_placed"))
|
||||
return;
|
||||
BlockFace direction = event.getDirection();
|
||||
// movedBlock = movedBlock.getRelative(direction, 2);
|
||||
|
||||
for (Block b : event.getBlocks())
|
||||
if (b.hasMetadata("player_placed")) {
|
||||
movedBlock = b.getRelative(direction);
|
||||
movedBlock.setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void blockPistonRetract(BlockPistonRetractEvent event) {
|
||||
BlockFace direction = event.getDirection();
|
||||
Block movedBlock = event.getBlock().getRelative(direction);
|
||||
movedBlock.setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void blockPistonExtend(BlockPistonExtendEvent event) {
|
||||
Block movedBlock = event.getBlock();
|
||||
if (!movedBlock.hasMetadata("player_placed"))
|
||||
return;
|
||||
BlockFace direction = event.getDirection();
|
||||
// movedBlock = movedBlock.getRelative(direction, 2);
|
||||
for (Block block : event.getBlocks()) {
|
||||
movedBlock = block.getRelative(direction);
|
||||
movedBlock.setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
}
|
||||
|
||||
for (Block b : event.getBlocks())
|
||||
if (b.hasMetadata("player_placed")) {
|
||||
movedBlock = b.getRelative(direction);
|
||||
movedBlock.setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Allows to mark cobblestone generated by cobblestone generators so that
|
||||
* exp is not gained by these blocks
|
||||
*/
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void cobblestoneGeneratorHandling(BlockFormEvent event) {
|
||||
if (event.getBlock().hasMetadata("player_placed"))
|
||||
event.getBlock().removeMetadata("player_placed", MMOCore.plugin);
|
||||
if (MMOCore.plugin.configManager.cobbleGeneratorXP) return;
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void blockPistonRetract(BlockPistonRetractEvent event) {
|
||||
BlockFace direction = event.getDirection();
|
||||
Block movedBlock = event.getBlock().getRelative(direction);
|
||||
movedBlock.setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
if (event.getBlock().getType() == Material.WATER || event.getBlock().getType() == Material.LAVA)
|
||||
if (event.getNewState().getType() == Material.COBBLESTONE || event.getNewState().getType() == Material.OBSIDIAN)
|
||||
event.getNewState().setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
|
||||
for (Block block : event.getBlocks()) {
|
||||
movedBlock = block.getRelative(direction);
|
||||
movedBlock.setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
}
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void handlePlayerStatistics(CustomBlockMineEvent event) {
|
||||
if (event.getBlockInfo().getBlock() instanceof VanillaBlockType)
|
||||
event.getPlayer().incrementStatistic(Statistic.MINE_BLOCK, ((VanillaBlockType) event.getBlockInfo().getBlock()).getType());
|
||||
}
|
||||
|
||||
/*
|
||||
* Allows to mark cobblestone generated by cobblestone generators so that
|
||||
* exp is not gained by these blocks
|
||||
*/
|
||||
private Location getSafeDropLocation(Block block, boolean self) {
|
||||
if (block.getType() == Material.AIR && self)
|
||||
return block.getLocation();
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void cobblestoneGeneratorHandling(BlockFormEvent event) {
|
||||
if(event.getBlock().hasMetadata("player_placed"))
|
||||
event.getBlock().removeMetadata("player_placed", MMOCore.plugin);
|
||||
if(MMOCore.plugin.configManager.cobbleGeneratorXP) return;
|
||||
for (BlockFace face : order) {
|
||||
Block relative = block.getRelative(face);
|
||||
if (!relative.getType().isSolid())
|
||||
return relative.getLocation().add(block.getLocation().subtract(relative.getLocation()).multiply(.6));
|
||||
}
|
||||
|
||||
if (event.getBlock().getType() == Material.WATER || event.getBlock().getType() == Material.LAVA)
|
||||
if (event.getNewState().getType() == Material.COBBLESTONE || event.getNewState().getType() == Material.OBSIDIAN)
|
||||
event.getNewState().setMetadata("player_placed", new FixedMetadataValue(MMOCore.plugin, true));
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void handlePlayerStatistics(CustomBlockMineEvent event) {
|
||||
if (event.getBlockInfo().getBlock() instanceof VanillaBlockType)
|
||||
event.getPlayer().incrementStatistic(Statistic.MINE_BLOCK, ((VanillaBlockType) event.getBlockInfo().getBlock()).getType());
|
||||
}
|
||||
|
||||
private Location getSafeDropLocation(Block block, boolean self) {
|
||||
if (block.getType() == Material.AIR && self)
|
||||
return block.getLocation();
|
||||
|
||||
for (BlockFace face : order) {
|
||||
Block relative = block.getRelative(face);
|
||||
if (!relative.getType().isSolid())
|
||||
return relative.getLocation().add(block.getLocation().subtract(relative.getLocation()).multiply(.6));
|
||||
}
|
||||
|
||||
return block.getLocation();
|
||||
}
|
||||
return block.getLocation();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user