AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 10:55:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

network: 1.20-pre3

Browse Source 
Killer entity id was removed from EndCombatEventS2CP and KillCombatEventS2CP
This commit is contained in:
Bixilon 2023-05-21 14:42:13 +02:00
parent abdb8d0a97
commit 00cc974d9f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/EndCombatEventS2CP.kt
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.protocol.packets.s2c.play.combat package de.bixilon.minosoft.protocol.packets.s2c.play.combat
import de.bixilon.minosoft.protocol.packets.factory.LoadPacket import de.bixilon.minosoft.protocol.packets.factory.LoadPacket
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_PRE3
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogLevels
@ -22,7 +23,7 @@ import de.bixilon.minosoft.util.logging.LogMessageType
@LoadPacket(parent = true) @LoadPacket(parent = true)
class EndCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP { class EndCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP {
val duration = buffer.readVarInt() val duration = buffer.readVarInt()
val entityId = buffer.readInt() val entityId = if (buffer.versionId >= V_1_20_PRE3) -1 else buffer.readInt()
override fun log(reducedLog: Boolean) { override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat end event (entityId=$entityId, duration=$duration)" } Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat end event (entityId=$entityId, duration=$duration)" }

7
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/combat/KillCombatEventS2CP.kt
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.protocol.packets.s2c.play.combat package de.bixilon.minosoft.protocol.packets.s2c.play.combat
import de.bixilon.minosoft.protocol.packets.factory.LoadPacket import de.bixilon.minosoft.protocol.packets.factory.LoadPacket
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_PRE3
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogLevels
@ -21,11 +22,11 @@ import de.bixilon.minosoft.util.logging.LogMessageType
@LoadPacket(parent = true) @LoadPacket(parent = true)
class KillCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP { class KillCombatEventS2CP(buffer: PlayInByteBuffer) : CombatEventS2CP {
val killerEntityId = buffer.readVarInt() val deadEntityId = buffer.readVarInt()
val deadEntityId = buffer.readInt() val killerEntityId = if (buffer.versionId >= V_1_20_PRE3) -1 else buffer.readInt()
val message = buffer.readChatComponent() val message = buffer.readChatComponent()
override fun log(reducedLog: Boolean) { override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat event kill (killerEntityId=$killerEntityId, deadEntityId=$deadEntityId, message=$message )" } Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Combat event kill (deadEntityId=$deadEntityId, killerEntityId=$killerEntityId, message=$message )" }
} }
} }

1
src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersions.kt
View File

@ -14,6 +14,7 @@ package de.bixilon.minosoft.protocol.protocol
@Suppress("UNUSED") @Suppress("UNUSED")
object ProtocolVersions { object ProtocolVersions {
const val V_1_20_PRE3 = 896
const val V_1_20_PRE2 = 895 const val V_1_20_PRE2 = 895
const val V_1_20_PRE1 = 894 const val V_1_20_PRE1 = 894
const val V_23W18A = 893 const val V_23W18A = 893

4
src/main/java/de/bixilon/minosoft/protocol/protocol/VersionSupport.kt
View File

@ -15,10 +15,10 @@ package de.bixilon.minosoft.protocol.protocol
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_13W41B import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_13W41B
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_19_4 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_19_4
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_PRE2 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_PRE3
object VersionSupport { object VersionSupport {
const val MINIMUM_VERSION = V_13W41B const val MINIMUM_VERSION = V_13W41B
const val LATEST_VERSION = V_1_20_PRE2 const val LATEST_VERSION = V_1_20_PRE3
const val LATEST_RELEASE = V_1_19_4 const val LATEST_RELEASE = V_1_19_4
} }

2
src/main/resources/assets/minosoft/mapping/assets_properties.json
View File

File diff suppressed because one or more lines are too long

5
src/main/resources/assets/minosoft/mapping/versions.json
View File

@ -1,4 +1,9 @@
{ {
"896": {
"name": "1.20-pre3",
"protocol_id": 1073741960,
"packets": 880
},
"895": { "895": {
"name": "1.20-pre2", "name": "1.20-pre2",
"protocol_id": 1073741959, "protocol_id": 1073741959,