AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 20:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

network: only remove explosion blocks when mode is DESTRUCT

Browse Source
This commit is contained in:
Moritz Zwerger 2023-12-15 07:37:24 +01:00
parent be30d5a3b4
commit 01573c4ace
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/world/ExplosionS2CP.kt
View File

@ -41,7 +41,7 @@ class ExplosionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val power = buffer.readFloat() val power = buffer.readFloat()
val explodedBlocks: Array<Vec3i> = buffer.readArray((buffer.versionId < V_1_17).decide({ buffer.readInt() }, { buffer.readVarInt() })) { Vec3i(buffer.readByte(), buffer.readByte(), buffer.readByte()) } // ToDo: Find out version val explodedBlocks: Array<Vec3i> = buffer.readArray((buffer.versionId < V_1_17).decide({ buffer.readInt() }, { buffer.readVarInt() })) { Vec3i(buffer.readByte(), buffer.readByte(), buffer.readByte()) } // ToDo: Find out version
val velocity = buffer.readVec3f() val velocity = buffer.readVec3f()
val destruct = if (buffer.versionId >= V_23W45A) buffer.readEnum(DestructionTypes) else null val destruct = if (buffer.versionId >= V_23W45A) buffer.readEnum(DestructionTypes) else DestructionTypes.DESTROY
val particle = if (buffer.versionId >= V_23W45A) buffer.readParticleData() else null val particle = if (buffer.versionId >= V_23W45A) buffer.readParticleData() else null
val emitter = if (buffer.versionId >= V_23W45A) buffer.readParticleData() else null val emitter = if (buffer.versionId >= V_23W45A) buffer.readParticleData() else null
val sound = if (buffer.versionId >= V_23W45A) buffer.readNamedSound() else null val sound = if (buffer.versionId >= V_23W45A) buffer.readNamedSound() else null
@ -94,7 +94,9 @@ class ExplosionS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
} }
override fun handle(connection: PlayConnection) { override fun handle(connection: PlayConnection) {
connection.world.clearBlocks(position.floor, this.explodedBlocks) if (destruct == DestructionTypes.DESTROY) { // TODO: handle DECAY, TRIGGER
connection.world.clearBlocks(position.floor, this.explodedBlocks)
}
connection.player.physics.velocity = connection.player.physics.velocity + velocity connection.player.physics.velocity = connection.player.physics.velocity + velocity
connection.events.fire(ExplosionEvent(connection, this)) connection.events.fire(ExplosionEvent(connection, this))