Skip to content

Commit 630837f

Browse files
authored
Merge pull request #29 from steveb05/fix/wrong-horse-parent-class
Fix client disconnections caused by incorrect metadata offsets in horse packets
2 parents 9032d33 + a9fc412 commit 630837f

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

api/src/main/java/me/tofaa/entitylib/meta/mobs/horse/BaseHorseMeta.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package me.tofaa.entitylib.meta.mobs.horse;
22

3-
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
43
import me.tofaa.entitylib.meta.Metadata;
5-
import me.tofaa.entitylib.meta.types.MobMeta;
4+
import me.tofaa.entitylib.meta.types.AgeableMeta;
65

7-
import java.util.Optional;
8-
import java.util.UUID;
6+
public abstract class BaseHorseMeta extends AgeableMeta {
97

10-
public abstract class BaseHorseMeta extends MobMeta {
11-
12-
public static final byte OFFSET = MobMeta.MAX_OFFSET;
13-
public static final byte MAX_OFFSET = OFFSET + 2;
8+
public static final byte OFFSET = AgeableMeta.MAX_OFFSET;
9+
public static final byte MAX_OFFSET = OFFSET + 1;
1410

1511
private final static byte TAMED_BIT = 0x02;
1612
private final static byte SADDLED_BIT = 0x04;
@@ -70,13 +66,4 @@ public boolean isMouthOpen() {
7066
public void setMouthOpen(boolean value) {
7167
setMaskBit(OFFSET, MOUTH_OPEN_BIT, value);
7268
}
73-
74-
public Optional<UUID> getOwner() {
75-
return super.metadata.getIndex(offset(OFFSET, 1), Optional.empty());
76-
}
77-
78-
public void setOwner(UUID value) {
79-
super.metadata.setIndex(offset(OFFSET, 1), EntityDataTypes.OPTIONAL_UUID, Optional.of(value));
80-
}
81-
8269
}

0 commit comments

Comments
 (0)