GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Check if boat is valid when updating paddles (#4597)

Browse source 
* Check if boat is valid when updating paddles

* Add comment

* Refactor boat paddling to use ticks

* Null check
This commit is contained in:
AJ Ferguson 2024-04-24 08:41:57 -04:00 committed by GitHub
parent 16385a4e2b
commit c19b4ad306
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java
View file

@ -42,7 +42,7 @@ import org.geysermc.geyser.util.InteractiveTag;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class BoatEntity extends Entity { public class BoatEntity extends Entity implements Tickable {
/** /**
* Required when IS_BUOYANT is sent in order for boats to work in the water. <br> * Required when IS_BUOYANT is sent in order for boats to work in the water. <br>
@ -58,6 +58,7 @@ public class BoatEntity extends Entity {
private float paddleTimeLeft; private float paddleTimeLeft;
private boolean isPaddlingRight; private boolean isPaddlingRight;
private float paddleTimeRight; private float paddleTimeRight;
private boolean doTick;
/** /**
* Saved for using the "pick" functionality on a boat. * Saved for using the "pick" functionality on a boat.
@ -133,34 +134,16 @@ public class BoatEntity extends Entity {
public void setPaddlingLeft(BooleanEntityMetadata entityMetadata) { public void setPaddlingLeft(BooleanEntityMetadata entityMetadata) {
isPaddlingLeft = entityMetadata.getPrimitiveValue(); isPaddlingLeft = entityMetadata.getPrimitiveValue();
if (isPaddlingLeft) { if (!isPaddlingLeft) {
// Java sends simply "true" and "false" (is_paddling_left), Bedrock keeps sending packets as you're rowing paddleTimeLeft = 0.0f;
// This is an asynchronous method that emulates Bedrock rowing until "false" is sent.
paddleTimeLeft = 0f;
if (!this.passengers.isEmpty()) {
// Get the entity by the first stored passenger and convey motion in this manner
Entity entity = this.passengers.get(0);
if (entity != null) {
updateLeftPaddle(session, entity);
}
}
} else {
// Indicate that the row position should be reset
dirtyMetadata.put(EntityDataTypes.ROW_TIME_LEFT, 0.0f); dirtyMetadata.put(EntityDataTypes.ROW_TIME_LEFT, 0.0f);
} }
} }
public void setPaddlingRight(BooleanEntityMetadata entityMetadata) { public void setPaddlingRight(BooleanEntityMetadata entityMetadata) {
isPaddlingRight = entityMetadata.getPrimitiveValue(); isPaddlingRight = entityMetadata.getPrimitiveValue();
if (isPaddlingRight) { if (!isPaddlingRight) {
paddleTimeRight = 0f; paddleTimeRight = 0.0f;
if (!this.passengers.isEmpty()) {
Entity entity = this.passengers.get(0);
if (entity != null) {
updateRightPaddle(session, entity);
}
}
} else {
dirtyMetadata.put(EntityDataTypes.ROW_TIME_RIGHT, 0.0f); dirtyMetadata.put(EntityDataTypes.ROW_TIME_RIGHT, 0.0f);
} }
} }
@ -186,29 +169,26 @@ public class BoatEntity extends Entity {
} }
} }
private void updateLeftPaddle(GeyserSession session, Entity rower) { @Override
public void tick() {
// Java sends simply "true" and "false" (is_paddling_left), Bedrock keeps sending packets as you're rowing
doTick = !doTick; // Run every 100 ms
if (!doTick || passengers.isEmpty()) {
return;
}
Entity rower = passengers.get(0);
if (rower == null) {
return;
}
if (isPaddlingLeft) { if (isPaddlingLeft) {
paddleTimeLeft += ROWING_SPEED; paddleTimeLeft += ROWING_SPEED;
sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_LEFT, paddleTimeLeft); sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_LEFT, paddleTimeLeft);
session.scheduleInEventLoop(() ->
updateLeftPaddle(session, rower),
100,
TimeUnit.MILLISECONDS
);
} }
}
private void updateRightPaddle(GeyserSession session, Entity rower) {
if (isPaddlingRight) { if (isPaddlingRight) {
paddleTimeRight += ROWING_SPEED; paddleTimeRight += ROWING_SPEED;
sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_RIGHT, paddleTimeRight); sendAnimationPacket(session, rower, AnimatePacket.Action.ROW_RIGHT, paddleTimeRight);
session.scheduleInEventLoop(() ->
updateRightPaddle(session, rower),
100,
TimeUnit.MILLISECONDS
);
} }
} }

2
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -1167,6 +1167,8 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
/** /**
* Schedules a task and prints a stack trace if an error occurs. * Schedules a task and prints a stack trace if an error occurs.
* <p>
* The task will not run if the session is closed.
*/ */
public ScheduledFuture<?> scheduleInEventLoop(Runnable runnable, long duration, TimeUnit timeUnit) { public ScheduledFuture<?> scheduleInEventLoop(Runnable runnable, long duration, TimeUnit timeUnit) {
return eventLoop.schedule(() -> { return eventLoop.schedule(() -> {