mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Added 1.13 logs

Browse Source
This commit is contained in:
MisterErwin 2018-09-04 18:43:30 +02:00 committed by TheBusyBiscuit
parent 3f588e92ba
commit 9f8b728249
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/me/mrCookieSlime/Slimefun/Objects/MultiBlock.java
View File

@ -3,6 +3,7 @@ package me.mrCookieSlime.Slimefun.Objects;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHook;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunMachine; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunMachine;
@ -44,9 +45,8 @@ public class MultiBlock {
if (trigger == mb.getTriggerBlock()) { if (trigger == mb.getTriggerBlock()) {
for (int i = 0; i < mb.getBuild().length; i++) { for (int i = 0; i < mb.getBuild().length; i++) {
if (mb.getBuild()[i] != null) { if (mb.getBuild()[i] != null) {
if (mb.getBuild()[i] == Material.LOG) { if (MaterialHook.isLog( mb.getBuild()[i])) {
// TODO: Proper Wood Checks if (!MaterialHook.isLog(blocks[i])) return false;
if (!blocks[i].toString().contains("LOG")) return false;
} }
else if (mb.getBuild()[i] != blocks[i]) return false; else if (mb.getBuild()[i] != blocks[i]) return false;
} }
@ -63,9 +63,9 @@ public class MultiBlock {
else if (trigger == mb.getTriggerBlock()) { else if (trigger == mb.getTriggerBlock()) {
for (int i = 0; i < mb.getBuild().length; i++) { for (int i = 0; i < mb.getBuild().length; i++) {
if (mb.getBuild()[i] != null) { if (mb.getBuild()[i] != null) {
if (mb.getBuild()[i] == Material.LOG) { if (MaterialHook.isLog(mb.getBuild()[i])) {
// TODO: Proper Wood Checks // TODO: Proper Wood Checks
if (!blocks[i].toString().contains("LOG")) return false; if (!MaterialHook.isLog(blocks[i])) return false;
} }
else if (mb.getBuild()[i] != blocks[i]) return false; else if (mb.getBuild()[i] != blocks[i]) return false;
} }