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

Compare commits

base: DBot:d0ee1fb0e37e4307b21191a8ac9a239305b84cd7
Branches Tags
DBot:1.21
DBot:item-pipes
DBot:world-structures
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20
..
compare: DBot:13c9e93d312d42a68b65aa47d7910cefb4b6f307
Branches Tags
DBot:item-pipes
DBot:world-structures
DBot:1.21
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20

No commits in common. "d0ee1fb0e37e4307b21191a8ac9a239305b84cd7" and "13c9e93d312d42a68b65aa47d7910cefb4b6f307" have entirely different histories.
d0ee1fb0e3 ... 13c9e93d31

2 changed files with 0 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/mc/otm/container/CombinedContainer.kt
View File

@ -34,10 +34,6 @@ class CombinedContainer(containers: Stream<Pair<Container, Iterable<Int>>>) : IM
override val container: Container override val container: Container
get() = this@CombinedContainer get() = this@CombinedContainer
override fun setChanged() {
outer.setChanged()
}
override fun component1(): Int { override fun component1(): Int {
return super.component1() return super.component1()
} }

8
src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt
View File

@ -51,14 +51,6 @@ inline fun <S : Slot> makeSlots(containers: List<Container>?, size: Int, initial
open class MatterySlot(container: Container, index: Int, x: Int = 0, y: Int = 0) : Slot(container, index, x, y) { open class MatterySlot(container: Container, index: Int, x: Int = 0, y: Int = 0) : Slot(container, index, x, y) {
var ignoreSpectators = true var ignoreSpectators = true
override fun setChanged() {
if (container is IMatteryContainer) {
(container as IMatteryContainer).setChanged(index)
} else {
super.setChanged()
}
}
override fun mayPickup(player: Player): Boolean { override fun mayPickup(player: Player): Boolean {
return super.mayPickup(player) && (!ignoreSpectators || !player.isSpectator) return super.mayPickup(player) && (!ignoreSpectators || !player.isSpectator)
} }