diff --git a/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt index 49a7e4b6a..55097d32f 100644 --- a/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt @@ -251,7 +251,7 @@ class LocalPlayerEntity( 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 verticalCollision = collisionMovement.y != movement.y diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/CollectItemAnimationEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/CollectItemAnimationEvent.kt index 899e5e9aa..a97d8c0f9 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/CollectItemAnimationEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/CollectItemAnimationEvent.kt @@ -12,8 +12,8 @@ */ 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.item.ItemEntity import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.ItemCollectAnimationS2CP @@ -22,11 +22,10 @@ import de.bixilon.minosoft.util.KUtil.unsafeCast class CollectItemAnimationEvent( connection: PlayConnection, initiator: EventInitiators, - val itemEntity: ItemEntity, + val collectedEntity: Entity, val collector: LivingEntity, val count: Int, ) : CancelableEvent(connection, initiator) { - - constructor(connection: PlayConnection, packet: ItemCollectAnimationS2CP) : this(connection, EventInitiators.SERVER, connection.world.entities[packet.itemEntityId]!!.unsafeCast(), connection.world.entities[packet.collectorEntityId]!!.unsafeCast(), packet.count) + constructor(connection: PlayConnection, packet: ItemCollectAnimationS2CP) : this(connection, EventInitiators.SERVER, connection.world.entities[packet.itemEntityId]!!.unsafeCast(), connection.world.entities[packet.collectorEntityId]!!.unsafeCast(), packet.count) }