mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge pull request #573 from AtomicScience/master
Fixed Cooler rejecting Juices
This commit is contained in:
commit
7fefb0ea15
@ -15,6 +15,7 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
|
|||||||
|
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
@ -65,8 +66,7 @@ public class BackpackListener implements Listener {
|
|||||||
else {
|
else {
|
||||||
SlimefunItem sfItem = SlimefunItem.getByItem(e.getCurrentItem());
|
SlimefunItem sfItem = SlimefunItem.getByItem(e.getCurrentItem());
|
||||||
if (SlimefunManager.isItemSimiliar(item, SlimefunItem.getItem("COOLER"), false)) {
|
if (SlimefunManager.isItemSimiliar(item, SlimefunItem.getItem("COOLER"), false)) {
|
||||||
if (e.getCurrentItem() == null);
|
if (e.getCurrentItem() == null || e.getCurrentItem().getType().equals(Material.AIR));
|
||||||
else if (sfItem == null) e.setCancelled(true);
|
|
||||||
else if (!(sfItem instanceof Juice)) e.setCancelled(true);
|
else if (!(sfItem instanceof Juice)) e.setCancelled(true);
|
||||||
}
|
}
|
||||||
else if (e.getCurrentItem() != null && e.getCurrentItem().getType().toString().contains("SHULKER_BOX")) e.setCancelled(true);
|
else if (e.getCurrentItem() != null && e.getCurrentItem().getType().toString().contains("SHULKER_BOX")) e.setCancelled(true);
|
||||||
|
Loading…
Reference in New Issue
Block a user