Upstream/WildLoaders
1
0
Fork 0
mirror of https://github.com/BG-Software-LLC/WildLoaders.git synced 2024-11-10 10:09:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed exploding loaders not removing them

Browse Source
This commit is contained in:
OmerBenGera 2021-02-03 12:28:08 +02:00
parent 48f7d478b0
commit 30db9d6480
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/bgsoftware/wildloaders/listeners/BlocksListener.java
View File

@ -8,12 +8,14 @@ import com.bgsoftware.wildloaders.utils.chunks.ChunkPosition;
import com.bgsoftware.wildloaders.utils.legacy.Materials;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import java.util.Optional;
@ -58,19 +60,13 @@ public final class BlocksListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onLoaderBreak(BlockBreakEvent e){
Location blockLoc = e.getBlock().getLocation();
Optional<ChunkLoader> optionalChunkLoader = plugin.getLoaders().getChunkLoader(blockLoc);
if(handleLoaderBreak(e.getBlock(), e.getPlayer().getGameMode() != GameMode.CREATIVE))
Locale.BROKE_LOADER.send(e.getPlayer());
}
if(!optionalChunkLoader.isPresent())
return;
ChunkLoader chunkLoader = optionalChunkLoader.get();
chunkLoader.remove();
if(e.getPlayer().getGameMode() != GameMode.CREATIVE)
blockLoc.getWorld().dropItemNaturally(blockLoc, chunkLoader.getLoaderItem());
Locale.BROKE_LOADER.send(e.getPlayer());
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onLoaderExplode(EntityExplodeEvent e){
e.blockList().removeIf(block -> handleLoaderBreak(block, true));
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@ -93,4 +89,20 @@ public final class BlocksListener implements Listener {
e.setCancelled(true);
}
private boolean handleLoaderBreak(Block block, boolean dropItem){
Location blockLoc = block.getLocation();
Optional<ChunkLoader> optionalChunkLoader = plugin.getLoaders().getChunkLoader(blockLoc);
if(!optionalChunkLoader.isPresent())
return false;
ChunkLoader chunkLoader = optionalChunkLoader.get();
chunkLoader.remove();
if(dropItem)
blockLoc.getWorld().dropItemNaturally(blockLoc, chunkLoader.getLoaderItem());
return true;
}
}