Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from Sefiraat:master #129

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[pull] master from Sefiraat:master #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fff63d1
simple thing
JustAHuman-xD Oct 19, 2024
e37e2c5
sf version cause jitpack is dumb
JustAHuman-xD Oct 19, 2024
4db3185
Merge branch 'master' into chore/prevent-storages-in-storages
JustAHuman-xD Oct 19, 2024
8bffd08
Merge pull request #219 from JustAHuman-xD/chore/prevent-storages-in-…
Sefiraat Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>f1363ceadf</version>
<version>0a7fea8</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,8 @@ public static void tryInputItem(Location location, ItemStack[] input, QuantumCac
private static boolean isBlacklisted(@Nonnull ItemStack itemStack) {
return itemStack.getType() == Material.AIR
|| itemStack.getType().getMaxDurability() < 0
|| Tag.SHULKER_BOXES.isTagged(itemStack.getType());
|| Tag.SHULKER_BOXES.isTagged(itemStack.getType())
|| SlimefunItem.getByItem(itemStack) instanceof NetworkQuantumStorage;
}

@ParametersAreNonnullByDefault
Expand Down