DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix non stackable items not getting moved to filtered slots first

Browse Source
This commit is contained in:
DBotThePony 2023-04-10 19:26:24 +07:00
parent 9a1323ba46
commit 0bbe07f921
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt
View File

@ -1000,8 +1000,9 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial
val exoPackContainer = exoPackContainer val exoPackContainer = exoPackContainer
if (!stack.isStackable) { if (!stack.isStackable) {
// двигаем в отфильтрованные слоты
for (i in items.indices) { for (i in items.indices) {
if (items[i].isEmpty && (regularSlotFilters[i].value === null || regularSlotFilters[i].value === stack.item)) { if (items[i].isEmpty && regularSlotFilters[i].value === stack.item) {
items[i] = stack.copy() items[i] = stack.copy()
items[i].popTime = 5 items[i].popTime = 5
stack.count = 0 stack.count = 0
@ -1010,7 +1011,26 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial
} }
for (i in 0 until exoPackContainer.containerSize) { for (i in 0 until exoPackContainer.containerSize) {
if (exoPackContainer[i].isEmpty && exoPackContainer.testSlotFilter(i, stack)) { if (exoPackContainer[i].isEmpty && exoPackContainer.hasSlotFilter(i) && exoPackContainer.testSlotFilter(i, stack)) {
exoPackContainer[i] = stack.copy()
exoPackContainer[i].popTime = 5
stack.count = 0
return true
}
}
// двигаем в обычные слоты
for (i in items.indices) {
if (items[i].isEmpty && regularSlotFilters[i].value === null) {
items[i] = stack.copy()
items[i].popTime = 5
stack.count = 0
return true
}
}
for (i in 0 until exoPackContainer.containerSize) {
if (exoPackContainer[i].isEmpty && !exoPackContainer.hasSlotFilter(i)) {
exoPackContainer[i] = stack.copy() exoPackContainer[i] = stack.copy()
exoPackContainer[i].popTime = 5 exoPackContainer[i].popTime = 5
stack.count = 0 stack.count = 0