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

fix some exceptions when collecting arrows

Browse Source
This commit is contained in:
Bixilon 2021-06-05 13:47:51 +02:00 committed by Lukas
parent 93db26e250
commit 136702ad8c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt
View File

@ -251,7 +251,7 @@ class LocalPlayerEntity(
movement = connection.collisionDetector.sneak(this, movement) movement = connection.collisionDetector.sneak(this, movement)
val collisionMovement = connection.collisionDetector.collide(null, movement, aabb) val collisionMovement = connection.collisionDetector.collide(null, movement, aabb, true)
horizontalCollision = collisionMovement.x != movement.x || collisionMovement.z != movement.z horizontalCollision = collisionMovement.x != movement.x || collisionMovement.z != movement.z
verticalCollision = collisionMovement.y != movement.y verticalCollision = collisionMovement.y != movement.y

7
src/main/java/de/bixilon/minosoft/modding/event/events/CollectItemAnimationEvent.kt
View File

@ -12,8 +12,8 @@
*/ */
package de.bixilon.minosoft.modding.event.events package de.bixilon.minosoft.modding.event.events
import de.bixilon.minosoft.data.entities.entities.Entity
import de.bixilon.minosoft.data.entities.entities.LivingEntity import de.bixilon.minosoft.data.entities.entities.LivingEntity
import de.bixilon.minosoft.data.entities.entities.item.ItemEntity
import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.modding.event.EventInitiators
import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.network.connection.PlayConnection
import de.bixilon.minosoft.protocol.packets.s2c.play.ItemCollectAnimationS2CP import de.bixilon.minosoft.protocol.packets.s2c.play.ItemCollectAnimationS2CP
@ -22,11 +22,10 @@ import de.bixilon.minosoft.util.KUtil.unsafeCast
class CollectItemAnimationEvent( class CollectItemAnimationEvent(
connection: PlayConnection, connection: PlayConnection,
initiator: EventInitiators, initiator: EventInitiators,
val itemEntity: ItemEntity, val collectedEntity: Entity,
val collector: LivingEntity, val collector: LivingEntity,
val count: Int, val count: Int,
) : CancelableEvent(connection, initiator) { ) : CancelableEvent(connection, initiator) {
constructor(connection: PlayConnection, packet: ItemCollectAnimationS2CP) : this(connection, EventInitiators.SERVER, connection.world.entities[packet.itemEntityId]!!.unsafeCast<Entity>(), connection.world.entities[packet.collectorEntityId]!!.unsafeCast<LivingEntity>(), packet.count)
constructor(connection: PlayConnection, packet: ItemCollectAnimationS2CP) : this(connection, EventInitiators.SERVER, connection.world.entities[packet.itemEntityId]!!.unsafeCast<ItemEntity>(), connection.world.entities[packet.collectorEntityId]!!.unsafeCast<LivingEntity>(), packet.count)
} }