Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-12-22 15:39:22 +01:00
Code Issues Projects Releases Wiki Activity

oops

Browse source
This commit is contained in:
Ell 2024-12-04 20:35:45 +01:00
parent 9aeb5d807c
commit 4a04535050
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java
View file

@ -410,11 +410,11 @@ public class PipeNetwork extends SavedData implements GraphListener<BlockPos, Ne
} }
public void createNetworkLock(NetworkLock lock) { public void createNetworkLock(NetworkLock lock) {
this.networkLocks.put(lock.location != null ? lock.location.getPos() : null, lock); this.networkLocks.put(lock.location.getPos(), lock);
} }
public void resolveNetworkLock(NetworkLock lock) { public void resolveNetworkLock(NetworkLock lock) {
this.networkLocks.remove(lock.location != null ? lock.location.getPos() : null, lock); this.networkLocks.remove(lock.location.getPos(), lock);
} }
public List<NetworkLock> getNetworkLocks(BlockPos pos) { public List<NetworkLock> getNetworkLocks(BlockPos pos) {
@ -422,7 +422,7 @@ public class PipeNetwork extends SavedData implements GraphListener<BlockPos, Ne
} }
public int getLockedAmount(BlockPos pos, ItemStack stack, NetworkLock ignoredLock, ItemEquality... equalityTypes) { public int getLockedAmount(BlockPos pos, ItemStack stack, NetworkLock ignoredLock, ItemEquality... equalityTypes) {
return Streams.concat(this.getNetworkLocks(pos).stream(), this.getNetworkLocks(null).stream()) return this.getNetworkLocks(pos).stream()
.filter(l -> !l.equals(ignoredLock) && ItemEquality.compareItems(l.stack, stack, equalityTypes)) .filter(l -> !l.equals(ignoredLock) && ItemEquality.compareItems(l.stack, stack, equalityTypes))
.mapToInt(l -> l.stack.getCount()).sum(); .mapToInt(l -> l.stack.getCount()).sum();
} }