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

Consolidate left/right parrot checks into one boolean

Browse source 
The 1.17 update missed a couple of updates. Address the problem by only checking once.

Fixes #2402
This commit is contained in:
Camotoy 2021-07-21 13:44:11 -04:00
parent 8a218455d4
commit 6b84e07c34
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
connector/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java
View file

@ -271,8 +271,9 @@ public class PlayerEntity extends LivingEntity {
// Parrot occupying shoulder // Parrot occupying shoulder
if (entityMetadata.getId() == 19 || entityMetadata.getId() == 20) { if (entityMetadata.getId() == 19 || entityMetadata.getId() == 20) {
CompoundTag tag = (CompoundTag) entityMetadata.getValue(); CompoundTag tag = (CompoundTag) entityMetadata.getValue();
boolean isLeft = entityMetadata.getId() == 19;
if (tag != null && !tag.isEmpty()) { if (tag != null && !tag.isEmpty()) {
if ((entityMetadata.getId() == 19 && leftParrot != null) || (entityMetadata.getId() == 20 && rightParrot != null)) { if ((isLeft && leftParrot != null) || (!isLeft && rightParrot != null)) {
// No need to update a parrot's data when it already exists // No need to update a parrot's data when it already exists
return; return;
} }
@ -282,26 +283,26 @@ public class PlayerEntity extends LivingEntity {
parrot.spawnEntity(session); parrot.spawnEntity(session);
parrot.getMetadata().put(EntityData.VARIANT, tag.get("Variant").getValue()); parrot.getMetadata().put(EntityData.VARIANT, tag.get("Variant").getValue());
// Different position whether the parrot is left or right // Different position whether the parrot is left or right
float offset = (entityMetadata.getId() == 18) ? 0.4f : -0.4f; float offset = isLeft ? 0.4f : -0.4f;
parrot.getMetadata().put(EntityData.RIDER_SEAT_POSITION, Vector3f.from(offset, -0.22, -0.1)); parrot.getMetadata().put(EntityData.RIDER_SEAT_POSITION, Vector3f.from(offset, -0.22, -0.1));
parrot.getMetadata().put(EntityData.RIDER_ROTATION_LOCKED, 1); parrot.getMetadata().put(EntityData.RIDER_ROTATION_LOCKED, 1);
parrot.updateBedrockMetadata(session); parrot.updateBedrockMetadata(session);
SetEntityLinkPacket linkPacket = new SetEntityLinkPacket(); SetEntityLinkPacket linkPacket = new SetEntityLinkPacket();
EntityLinkData.Type type = (entityMetadata.getId() == 18) ? EntityLinkData.Type.RIDER : EntityLinkData.Type.PASSENGER; EntityLinkData.Type type = isLeft ? EntityLinkData.Type.RIDER : EntityLinkData.Type.PASSENGER;
linkPacket.setEntityLink(new EntityLinkData(geyserId, parrot.getGeyserId(), type, false)); linkPacket.setEntityLink(new EntityLinkData(geyserId, parrot.getGeyserId(), type, false, false));
// Delay, or else spawned-in players won't get the link // Delay, or else spawned-in players won't get the link
// TODO: Find a better solution. This problem also exists with item frames // TODO: Find a better solution. This problem also exists with item frames
session.getConnector().getGeneralThreadPool().schedule(() -> session.sendUpstreamPacket(linkPacket), 500, TimeUnit.MILLISECONDS); session.getConnector().getGeneralThreadPool().schedule(() -> session.sendUpstreamPacket(linkPacket), 500, TimeUnit.MILLISECONDS);
if (entityMetadata.getId() == 18) { if (isLeft) {
leftParrot = parrot; leftParrot = parrot;
} else { } else {
rightParrot = parrot; rightParrot = parrot;
} }
} else { } else {
Entity parrot = (entityMetadata.getId() == 19 ? leftParrot : rightParrot); Entity parrot = isLeft ? leftParrot : rightParrot;
if (parrot != null) { if (parrot != null) {
parrot.despawnEntity(session); parrot.despawnEntity(session);
if (entityMetadata.getId() == 19) { if (isLeft) {
leftParrot = null; leftParrot = null;
} else { } else {
rightParrot = null; rightParrot = null;