AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 11:24:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

breaking: fix reverting action (1.19)

Browse Source
This commit is contained in:
Bixilon 2023-03-18 14:05:20 +01:00
parent 660aae38d4
commit 10ffbb7f29
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/breaking/executor/SequencedExecutorTest.kt
View File

@ -43,7 +43,9 @@ class SequencedExecutorTest {
executor.start(Vec3i(1, 1, 1), state) executor.start(Vec3i(1, 1, 1), state)
connection.world[Vec3i(1, 1, 1)] = state // <- set the same block -> revert
executor.abort(Vec3i(1, 1, 1), state) // TODO: simulate packet
// connection.world[Vec3i(1, 1, 1)] = state // <- set the same block -> revert/cancel
executor.finish() executor.finish()
assertEquals(connection.world[Vec3i(1, 1, 1)], state) assertEquals(connection.world[Vec3i(1, 1, 1)], state)
@ -57,6 +59,7 @@ class SequencedExecutorTest {
executor.start(Vec3i(1, 1, 1), state) executor.start(Vec3i(1, 1, 1), state)
executor.finish() executor.finish()
Thread.sleep(10) // async, wait for thread to complete
assertNull(connection.world[Vec3i(1, 1, 1)]) assertNull(connection.world[Vec3i(1, 1, 1)])
} }
} }

1
src/main/java/de/bixilon/minosoft/input/interaction/breaking/executor/BreakingExecutor.kt
View File

@ -43,6 +43,7 @@ abstract class BreakingExecutor(protected val breaking: BreakHandler) {
open fun finish(): Int { open fun finish(): Int {
val state = this.state ?: Broken() val state = this.state ?: Broken()
val position = this.position ?: Broken() val position = this.position ?: Broken()
val abort = this.abort
reset() reset()
if (!abort) { if (!abort) {
execute(position, state) execute(position, state)

5
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/BlockS2CP.kt
View File

@ -13,7 +13,9 @@
package de.bixilon.minosoft.protocol.packets.s2c.play.block package de.bixilon.minosoft.protocol.packets.s2c.play.block
import de.bixilon.kotlinglm.vec3.Vec3i import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kutil.cast.CastUtil.nullCast
import de.bixilon.minosoft.data.registries.blocks.state.BlockState import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.input.interaction.breaking.executor.SequencedExecutor
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.factory.LoadPacket import de.bixilon.minosoft.protocol.packets.factory.LoadPacket
import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
@ -40,6 +42,9 @@ class BlockS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
override fun handle(connection: PlayConnection) { override fun handle(connection: PlayConnection) {
connection.world[position] = state connection.world[position] = state
if (state != null) {
connection.camera.interactions.breaking.executor.nullCast<SequencedExecutor>()?.abort(position, state)
}
} }
override fun log(reducedLog: Boolean) { override fun log(reducedLog: Boolean) {