Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-09-08 20:43:04 +02:00
Fix various horse bugs (#2115)
* Fix horse health display * Fix horses warping back when damaged * Fix horse jumping animation * Fix horses not taking damage while standing on magma * Allow mules and donkeys to jump
Dieser Commit ist enthalten in:
Ursprung
22c492fda6
Commit
70e28604b8
@ -32,6 +32,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
|
|||||||
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
||||||
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
|
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
|
||||||
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
|
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
|
||||||
|
import org.geysermc.connector.entity.attribute.AttributeType;
|
||||||
import org.geysermc.connector.entity.living.animal.AnimalEntity;
|
import org.geysermc.connector.entity.living.animal.AnimalEntity;
|
||||||
import org.geysermc.connector.entity.type.EntityType;
|
import org.geysermc.connector.entity.type.EntityType;
|
||||||
import org.geysermc.connector.network.session.GeyserSession;
|
import org.geysermc.connector.network.session.GeyserSession;
|
||||||
@ -44,6 +45,10 @@ public class AbstractHorseEntity extends AnimalEntity {
|
|||||||
|
|
||||||
// Specifies the size of the entity's inventory. Required to place slots in the entity.
|
// Specifies the size of the entity's inventory. Required to place slots in the entity.
|
||||||
metadata.put(EntityData.CONTAINER_BASE_SIZE, 2);
|
metadata.put(EntityData.CONTAINER_BASE_SIZE, 2);
|
||||||
|
// Add dummy health attribute since LivingEntity updates the attribute for us
|
||||||
|
attributes.put(AttributeType.HEALTH, AttributeType.HEALTH.getAttribute(20, 20));
|
||||||
|
// Add horse jump strength attribute to allow donkeys and mules to jump
|
||||||
|
attributes.put(AttributeType.HORSE_JUMP_STRENGTH, AttributeType.HORSE_JUMP_STRENGTH.getAttribute(0.5f, 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -85,9 +90,15 @@ public class AbstractHorseEntity extends AnimalEntity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Needed to control horses
|
// Needed to control horses
|
||||||
metadata.getFlags().setFlag(EntityFlag.CAN_POWER_JUMP, true);
|
boolean canPowerJump = entityType != EntityType.LLAMA && entityType != EntityType.TRADER_LLAMA;
|
||||||
|
metadata.getFlags().setFlag(EntityFlag.CAN_POWER_JUMP, canPowerJump);
|
||||||
metadata.getFlags().setFlag(EntityFlag.WASD_CONTROLLED, true);
|
metadata.getFlags().setFlag(EntityFlag.WASD_CONTROLLED, true);
|
||||||
|
|
||||||
super.updateBedrockMetadata(entityMetadata, session);
|
super.updateBedrockMetadata(entityMetadata, session);
|
||||||
|
|
||||||
|
if (entityMetadata.getId() == 8) {
|
||||||
|
// Update the health attribute
|
||||||
|
updateBedrockAttributes(session);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -355,6 +355,12 @@ public class GeyserSession implements CommandSender {
|
|||||||
@Setter
|
@Setter
|
||||||
private long lastMovementTimestamp = System.currentTimeMillis();
|
private long lastMovementTimestamp = System.currentTimeMillis();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used to send a ClientVehicleMovePacket for every PlayerInputPacket after idling on a boat/horse for more than 100ms
|
||||||
|
*/
|
||||||
|
@Setter
|
||||||
|
private long lastVehicleMoveTimestamp = System.currentTimeMillis();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Controls whether the daylight cycle gamerule has been sent to the client, so the sun/moon remain motionless.
|
* Controls whether the daylight cycle gamerule has been sent to the client, so the sun/moon remain motionless.
|
||||||
*/
|
*/
|
||||||
|
@ -41,6 +41,8 @@ public class BedrockMoveEntityAbsoluteTranslator extends PacketTranslator<MoveEn
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void translate(MoveEntityAbsolutePacket packet, GeyserSession session) {
|
public void translate(MoveEntityAbsolutePacket packet, GeyserSession session) {
|
||||||
|
session.setLastVehicleMoveTimestamp(System.currentTimeMillis());
|
||||||
|
|
||||||
float y = packet.getPosition().getY();
|
float y = packet.getPosition().getY();
|
||||||
if (session.getRidingVehicleEntity() instanceof BoatEntity) {
|
if (session.getRidingVehicleEntity() instanceof BoatEntity) {
|
||||||
// Remove some Y position to prevents boats from looking like they're floating in water
|
// Remove some Y position to prevents boats from looking like they're floating in water
|
||||||
|
@ -26,7 +26,15 @@
|
|||||||
package org.geysermc.connector.network.translators.bedrock;
|
package org.geysermc.connector.network.translators.bedrock;
|
||||||
|
|
||||||
import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientSteerVehiclePacket;
|
import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientSteerVehiclePacket;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientVehicleMovePacket;
|
||||||
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
|
||||||
import com.nukkitx.protocol.bedrock.packet.PlayerInputPacket;
|
import com.nukkitx.protocol.bedrock.packet.PlayerInputPacket;
|
||||||
|
import org.geysermc.connector.entity.BoatEntity;
|
||||||
|
import org.geysermc.connector.entity.Entity;
|
||||||
|
import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
|
||||||
|
import org.geysermc.connector.entity.living.animal.horse.LlamaEntity;
|
||||||
|
import org.geysermc.connector.entity.type.EntityType;
|
||||||
import org.geysermc.connector.network.session.GeyserSession;
|
import org.geysermc.connector.network.session.GeyserSession;
|
||||||
import org.geysermc.connector.network.translators.PacketTranslator;
|
import org.geysermc.connector.network.translators.PacketTranslator;
|
||||||
import org.geysermc.connector.network.translators.Translator;
|
import org.geysermc.connector.network.translators.Translator;
|
||||||
@ -44,5 +52,42 @@ public class BedrockPlayerInputTranslator extends PacketTranslator<PlayerInputPa
|
|||||||
);
|
);
|
||||||
|
|
||||||
session.sendDownstreamPacket(clientSteerVehiclePacket);
|
session.sendDownstreamPacket(clientSteerVehiclePacket);
|
||||||
|
|
||||||
|
// Bedrock only sends movement vehicle packets while moving
|
||||||
|
// This allows horses to take damage while standing on magma
|
||||||
|
Entity vehicle = session.getRidingVehicleEntity();
|
||||||
|
boolean sendMovement = false;
|
||||||
|
if (vehicle instanceof AbstractHorseEntity && !(vehicle instanceof LlamaEntity)) {
|
||||||
|
sendMovement = vehicle.isOnGround();
|
||||||
|
} else if (vehicle instanceof BoatEntity) {
|
||||||
|
if (vehicle.getPassengers().size() == 1) {
|
||||||
|
// The player is the only rider
|
||||||
|
sendMovement = true;
|
||||||
|
} else {
|
||||||
|
// Check if the player is the front rider
|
||||||
|
Vector3f seatPos = session.getPlayerEntity().getMetadata().getVector3f(EntityData.RIDER_SEAT_POSITION, null);
|
||||||
|
if (seatPos != null && seatPos.getX() > 0) {
|
||||||
|
sendMovement = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (sendMovement) {
|
||||||
|
long timeSinceVehicleMove = System.currentTimeMillis() - session.getLastVehicleMoveTimestamp();
|
||||||
|
if (timeSinceVehicleMove >= 100) {
|
||||||
|
Vector3f vehiclePosition = vehicle.getPosition();
|
||||||
|
Vector3f vehicleRotation = vehicle.getRotation();
|
||||||
|
|
||||||
|
if (vehicle instanceof BoatEntity) {
|
||||||
|
// Remove some Y position to prevents boats flying up
|
||||||
|
vehiclePosition = vehiclePosition.down(EntityType.BOAT.getOffset());
|
||||||
|
}
|
||||||
|
|
||||||
|
ClientVehicleMovePacket clientVehicleMovePacket = new ClientVehicleMovePacket(
|
||||||
|
vehiclePosition.getX(), vehiclePosition.getY(), vehiclePosition.getZ(),
|
||||||
|
vehicleRotation.getX() - 90, vehicleRotation.getY()
|
||||||
|
);
|
||||||
|
session.sendDownstreamPacket(clientVehicleMovePacket);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* @author GeyserMC
|
||||||
|
* @link https://github.com/GeyserMC/Geyser
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.geysermc.connector.network.translators.bedrock.entity.player;
|
||||||
|
|
||||||
|
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerState;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerStatePacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.RiderJumpPacket;
|
||||||
|
import org.geysermc.connector.entity.Entity;
|
||||||
|
import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
|
||||||
|
import org.geysermc.connector.network.session.GeyserSession;
|
||||||
|
import org.geysermc.connector.network.translators.PacketTranslator;
|
||||||
|
import org.geysermc.connector.network.translators.Translator;
|
||||||
|
|
||||||
|
@Translator(packet = RiderJumpPacket.class)
|
||||||
|
public class BedrockRiderJumpTranslator extends PacketTranslator<RiderJumpPacket> {
|
||||||
|
@Override
|
||||||
|
public void translate(RiderJumpPacket packet, GeyserSession session) {
|
||||||
|
Entity vehicle = session.getRidingVehicleEntity();
|
||||||
|
if (vehicle instanceof AbstractHorseEntity) {
|
||||||
|
ClientPlayerStatePacket playerStatePacket = new ClientPlayerStatePacket((int) vehicle.getEntityId(), PlayerState.START_HORSE_JUMP, packet.getJumpStrength());
|
||||||
|
session.sendDownstreamPacket(playerStatePacket);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -26,6 +26,7 @@
|
|||||||
package org.geysermc.connector.network.translators.java.entity;
|
package org.geysermc.connector.network.translators.java.entity;
|
||||||
|
|
||||||
import org.geysermc.connector.entity.Entity;
|
import org.geysermc.connector.entity.Entity;
|
||||||
|
import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
|
||||||
import org.geysermc.connector.network.session.GeyserSession;
|
import org.geysermc.connector.network.session.GeyserSession;
|
||||||
import org.geysermc.connector.network.translators.PacketTranslator;
|
import org.geysermc.connector.network.translators.PacketTranslator;
|
||||||
import org.geysermc.connector.network.translators.Translator;
|
import org.geysermc.connector.network.translators.Translator;
|
||||||
@ -47,6 +48,12 @@ public class JavaEntityVelocityTranslator extends PacketTranslator<ServerEntityV
|
|||||||
|
|
||||||
entity.setMotion(Vector3f.from(packet.getMotionX(), packet.getMotionY(), packet.getMotionZ()));
|
entity.setMotion(Vector3f.from(packet.getMotionX(), packet.getMotionY(), packet.getMotionZ()));
|
||||||
|
|
||||||
|
if (entity == session.getRidingVehicleEntity() && entity instanceof AbstractHorseEntity) {
|
||||||
|
// Horses for some reason teleport back when a SetEntityMotionPacket is sent while
|
||||||
|
// a player is riding on them. Java clients seem to ignore it anyways.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
SetEntityMotionPacket entityMotionPacket = new SetEntityMotionPacket();
|
SetEntityMotionPacket entityMotionPacket = new SetEntityMotionPacket();
|
||||||
entityMotionPacket.setRuntimeEntityId(entity.getGeyserId());
|
entityMotionPacket.setRuntimeEntityId(entity.getGeyserId());
|
||||||
entityMotionPacket.setMotion(entity.getMotion());
|
entityMotionPacket.setMotion(entity.getMotion());
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren