Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-09-08 20:43:04 +02:00
Fix rowing from Java to Bedrock (#1943)
Rowing apparently broke in possibly the 1.16 update and nobody noticed until now.
Dieser Commit ist enthalten in:
Ursprung
9f5a356180
Commit
325b8ab4d4
@ -28,6 +28,7 @@ package org.geysermc.connector.entity;
|
|||||||
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
|
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
|
||||||
import com.nukkitx.math.vector.Vector3f;
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
|
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.AnimatePacket;
|
||||||
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;
|
||||||
|
|
||||||
@ -105,27 +106,38 @@ public class BoatEntity extends Entity {
|
|||||||
metadata.put(EntityData.VARIANT, entityMetadata.getValue());
|
metadata.put(EntityData.VARIANT, entityMetadata.getValue());
|
||||||
} else if (entityMetadata.getId() == 11) {
|
} else if (entityMetadata.getId() == 11) {
|
||||||
isPaddlingLeft = (boolean) entityMetadata.getValue();
|
isPaddlingLeft = (boolean) entityMetadata.getValue();
|
||||||
if (!isPaddlingLeft) {
|
if (isPaddlingLeft) {
|
||||||
metadata.put(EntityData.ROW_TIME_LEFT, 0f);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Java sends simply "true" and "false" (is_paddling_left), Bedrock keeps sending packets as you're rowing
|
// Java sends simply "true" and "false" (is_paddling_left), Bedrock keeps sending packets as you're rowing
|
||||||
// This is an asynchronous method that emulates Bedrock rowing until "false" is sent.
|
// This is an asynchronous method that emulates Bedrock rowing until "false" is sent.
|
||||||
paddleTimeLeft = 0f;
|
paddleTimeLeft = 0f;
|
||||||
session.getConnector().getGeneralThreadPool().execute(() ->
|
if (!this.passengers.isEmpty()) {
|
||||||
updateLeftPaddle(session, entityMetadata)
|
// Get the entity by the first stored passenger and convey motion in this manner
|
||||||
);
|
Entity entity = session.getEntityCache().getEntityByJavaId(this.passengers.iterator().nextLong());
|
||||||
|
if (entity != null) {
|
||||||
|
session.getConnector().getGeneralThreadPool().execute(() ->
|
||||||
|
updateLeftPaddle(session, entity)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Indicate that the row position should be reset
|
||||||
|
metadata.put(EntityData.ROW_TIME_LEFT, 0.0f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (entityMetadata.getId() == 12) {
|
else if (entityMetadata.getId() == 12) {
|
||||||
isPaddlingRight = (boolean) entityMetadata.getValue();
|
isPaddlingRight = (boolean) entityMetadata.getValue();
|
||||||
if (!isPaddlingRight) {
|
if (isPaddlingRight) {
|
||||||
metadata.put(EntityData.ROW_TIME_RIGHT, 0f);
|
|
||||||
} else {
|
|
||||||
paddleTimeRight = 0f;
|
paddleTimeRight = 0f;
|
||||||
session.getConnector().getGeneralThreadPool().execute(() ->
|
if (!this.passengers.isEmpty()) {
|
||||||
updateRightPaddle(session, entityMetadata)
|
Entity entity = session.getEntityCache().getEntityByJavaId(this.passengers.iterator().nextLong());
|
||||||
);
|
if (entity != null) {
|
||||||
|
session.getConnector().getGeneralThreadPool().execute(() ->
|
||||||
|
updateRightPaddle(session, entity)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
metadata.put(EntityData.ROW_TIME_RIGHT, 0.0f);
|
||||||
}
|
}
|
||||||
} else if (entityMetadata.getId() == 13) {
|
} else if (entityMetadata.getId() == 13) {
|
||||||
// Possibly - I don't think this does anything?
|
// Possibly - I don't think this does anything?
|
||||||
@ -135,27 +147,46 @@ public class BoatEntity extends Entity {
|
|||||||
super.updateBedrockMetadata(entityMetadata, session);
|
super.updateBedrockMetadata(entityMetadata, session);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateLeftPaddle(GeyserSession session, EntityMetadata entityMetadata) {
|
@Override
|
||||||
|
public void updateBedrockMetadata(GeyserSession session) {
|
||||||
|
super.updateBedrockMetadata(session);
|
||||||
|
|
||||||
|
// As these indicate to reset rowing, remove them until it is time to send them out again.
|
||||||
|
metadata.remove(EntityData.ROW_TIME_LEFT);
|
||||||
|
metadata.remove(EntityData.ROW_TIME_RIGHT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateLeftPaddle(GeyserSession session, Entity rower) {
|
||||||
if (isPaddlingLeft) {
|
if (isPaddlingLeft) {
|
||||||
paddleTimeLeft += ROWING_SPEED;
|
paddleTimeLeft += ROWING_SPEED;
|
||||||
metadata.put(EntityData.ROW_TIME_LEFT, paddleTimeLeft);
|
sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_LEFT, paddleTimeLeft);
|
||||||
super.updateBedrockMetadata(entityMetadata, session);
|
|
||||||
session.getConnector().getGeneralThreadPool().schedule(() ->
|
session.getConnector().getGeneralThreadPool().schedule(() ->
|
||||||
updateLeftPaddle(session, entityMetadata),
|
updateLeftPaddle(session, rower),
|
||||||
100,
|
100,
|
||||||
TimeUnit.MILLISECONDS
|
TimeUnit.MILLISECONDS
|
||||||
);
|
);
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void updateRightPaddle(GeyserSession session, EntityMetadata entityMetadata) {
|
private void updateRightPaddle(GeyserSession session, Entity rower) {
|
||||||
if (isPaddlingRight) {
|
if (isPaddlingRight) {
|
||||||
paddleTimeRight += ROWING_SPEED;
|
paddleTimeRight += ROWING_SPEED;
|
||||||
metadata.put(EntityData.ROW_TIME_RIGHT, paddleTimeRight);
|
sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_RIGHT, paddleTimeRight);
|
||||||
super.updateBedrockMetadata(entityMetadata, session);
|
|
||||||
session.getConnector().getGeneralThreadPool().schedule(() ->
|
session.getConnector().getGeneralThreadPool().schedule(() ->
|
||||||
updateRightPaddle(session, entityMetadata),
|
updateRightPaddle(session, rower),
|
||||||
100,
|
100,
|
||||||
TimeUnit.MILLISECONDS
|
TimeUnit.MILLISECONDS
|
||||||
);
|
);
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendAnimationPacket(GeyserSession session, Entity rower, AnimatePacket.Action action, float rowTime) {
|
||||||
|
AnimatePacket packet = new AnimatePacket();
|
||||||
|
packet.setRuntimeEntityId(rower.getGeyserId());
|
||||||
|
packet.setAction(action);
|
||||||
|
packet.setRowingTime(rowTime);
|
||||||
|
session.sendUpstreamPacket(packet);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren