Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed loot chest not droping its contents

Browse Source
This commit is contained in:
Indyuce 2022-10-14 01:20:30 +02:00
parent 719ce614bc
commit 5d03594a1c
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MMOCore-API/src/main/java/net/Indyuce/mmocore/loot/chest/LootChest.java
View File

@ -10,6 +10,8 @@ import org.bukkit.Particle;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -80,18 +82,27 @@ public class LootChest {
if (!closeRunnable.isCancelled()) if (!closeRunnable.isCancelled())
closeRunnable.cancel(); closeRunnable.cancel();
// If a player is responsible of closing the chest, close it with sound /*
* If a player is responsible of closing the chest, play the
* closing sound and drop its content before clearing it
*/
if (player) { if (player) {
MMOCore.plugin.soundManager.getSound(SoundEvent.CLOSE_LOOT_CHEST).playAt(block.loc.bukkit()); MMOCore.plugin.soundManager.getSound(SoundEvent.CLOSE_LOOT_CHEST).playAt(block.loc.bukkit());
block.loc.getWorld().spawnParticle(Particle.CRIT, block.loc.bukkit().add(.5, .5, .5), 16, 0, 0, 0, .5); block.loc.getWorld().spawnParticle(Particle.CRIT, block.loc.bukkit().add(.5, .5, .5), 16, 0, 0, 0, .5);
final Inventory chestInv = ((Chest) block.loc.bukkit().getBlock().getState()).getBlockInventory();
final Location centerLoc = block.findCenterLocation();
for (ItemStack drop : chestInv.getContents())
if (drop != null && drop.getType() != Material.AIR)
block.getLocation().getWorld().dropItem(centerLoc, drop);
chestInv.clear();
} }
/* /*
* Must clean block inventory before replacing block otherwise loots fly * Must clean block inventory before replacing block otherwise loots fly
* off and accumulate on the ground (+during dev phase) * off and accumulate on the ground (+during dev phase)
*/ */
else
((Chest) block.loc.bukkit().getBlock().getState()).getBlockInventory().clear();
block.restore(); block.restore();
if (effectRunnable != null) if (effectRunnable != null)
@ -113,6 +124,10 @@ public class LootChest {
return loc; return loc;
} }
public Location findCenterLocation() {
return new Location(getLocation().getWorld(), loc.getX() + .5, loc.getY() + .5, loc.getZ() + .5);
}
@Deprecated @Deprecated
public boolean matches(Location loc) { public boolean matches(Location loc) {
return this.loc.getWorld().equals(loc.getWorld()) && this.loc.getX() == loc.getBlockX() && this.loc.getY() == loc.getBlockY() return this.loc.getWorld().equals(loc.getWorld()) && this.loc.getX() == loc.getBlockX() && this.loc.getY() == loc.getBlockY()