Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-22 18:25:59 +01:00
Code Issues Projects Releases Wiki Activity

Patch

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-09-22 18:10:05 -04:00
parent 6db6a8b84d
commit 3be979e59d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
View File

@ -6,12 +6,14 @@ import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.modules.Module; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.utils.Debugger; import com.songoda.epichoppers.utils.Debugger;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import xyz.wildseries.wildstacker.api.WildStackerAPI;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -50,6 +52,10 @@ public class ModuleSuction implements Module {
} }
if (e.hasMetadata("grabbed")) if (e.hasMetadata("grabbed"))
continue; continue;
if (Bukkit.getPluginManager().isPluginEnabled("WildStacker")) {
hopItem.setAmount(WildStackerAPI.getItemAmount((Item)e));
}
ItemStack item = ((Item) e).getItemStack(); ItemStack item = ((Item) e).getItemStack();
if (!canMove(hopperBlock.getInventory(), item)) { if (!canMove(hopperBlock.getInventory(), item)) {
continue; continue;

2
EpicHoppers-Plugin/src/main/resources/plugin.yml
View File

@ -2,7 +2,7 @@ name: EpicHoppers
description: EpicHoppers description: EpicHoppers
main: com.songoda.epichoppers.EpicHoppersPlugin main: com.songoda.epichoppers.EpicHoppersPlugin
depend: [Arconix] depend: [Arconix]
softdepend: [Towny, RedProtect, Kingdoms, PlotsSquared, GriefPrevention, USkyBlock, ASkyBlock, WorldGuard, Factions, Vault] softdepend: [WildStacker, Towny, RedProtect, Kingdoms, PlotsSquared, GriefPrevention, USkyBlock, ASkyBlock, WorldGuard, Factions, Vault]
version: 3 version: 3
author: Songoda author: Songoda
api-version: 1.13 api-version: 1.13