Skip to content

Fix client disconnections caused by incorrect metadata offsets in horse packets #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tofaa2 merged 2 commits into from
May 1, 2025
Merged

Fix client disconnections caused by incorrect metadata offsets in horse packets #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a5c7c8
fix: correct BaseHorseMeta inheritance and remove non-functional owne…
steveb05 Apr 30, 2025
a9fc412
Merge remote-tracking branch 'origin/master' into fork/steveb05/fix/w…
Bram1903 May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions api/src/main/java/me/tofaa/entitylib/meta/mobs/horse/BaseHorseMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package me.tofaa.entitylib.meta.mobs.horse;

import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
import me.tofaa.entitylib.meta.Metadata;
import me.tofaa.entitylib.meta.types.MobMeta;
import me.tofaa.entitylib.meta.types.AgeableMeta;

import java.util.Optional;
import java.util.UUID;
public abstract class BaseHorseMeta extends AgeableMeta {

public abstract class BaseHorseMeta extends MobMeta {

public static final byte OFFSET = MobMeta.MAX_OFFSET;
public static final byte MAX_OFFSET = OFFSET + 2;
public static final byte OFFSET = AgeableMeta.MAX_OFFSET;
public static final byte MAX_OFFSET = OFFSET + 1;

private final static byte TAMED_BIT = 0x02;
private final static byte SADDLED_BIT = 0x04;
Expand Down Expand Up @@ -70,13 +66,4 @@ public boolean isMouthOpen() {
public void setMouthOpen(boolean value) {
setMaskBit(OFFSET, MOUTH_OPEN_BIT, value);
}

public Optional<UUID> getOwner() {
return super.metadata.getIndex(offset(OFFSET, 1), Optional.empty());
}

public void setOwner(UUID value) {
super.metadata.setIndex(offset(OFFSET, 1), EntityDataTypes.OPTIONAL_UUID, Optional.of(value));
}

}
Loading