Skip to content

Commit eafd15a

Browse files
committed
fix scale & hide
1 parent dffd6b6 commit eafd15a

4 files changed

Lines changed: 16 additions & 3 deletions

File tree

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dependency-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>org.geysermc.geyser</groupId>
6666
<artifactId>core</artifactId>
67-
<version>2.7.0-SNAPSHOT</version>
67+
<version>2.7.1-SNAPSHOT</version>
6868
<scope>system</scope>
6969
<systemPath>${project.basedir}/libs/Geyser-Standalone.jar</systemPath>
7070
</dependency>

src/main/java/me/zimzaza4/geyserdisplayentity/entity/ItemDisplayEntity.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class ItemDisplayEntity extends SlotDisplayEntity {
3131
private DisplayType displayType = DisplayType.NONE;
3232
private Byte color;
3333
private boolean custom = false;
34+
private boolean needHide = false;
3435
private double lastOffset = 0;
3536

3637
public ItemDisplayEntity(GeyserSession session, int entityId, long geyserId, UUID uuid,
@@ -111,12 +112,24 @@ public void setDisplayedItem(EntityMetadata<ItemStack, ?> entityMetadata) {
111112
.javaIdentifier();
112113
if (Settings.IMP.HIDE_TYPES.contains(javaId)) {
113114
setInvisible(true);
115+
needHide = true;
114116
this.dirtyMetadata.put(EntityDataTypes.SCALE, 0f);
117+
} else {
118+
needHide = false;
115119
}
116120

117121
updateMainHand(session);
118122
}
119123

124+
@Override
125+
protected void applyScale() {
126+
if (needHide) {
127+
this.dirtyMetadata.put(EntityDataTypes.SCALE, 0f);
128+
} else {
129+
super.applyScale();
130+
}
131+
}
132+
120133
@Override
121134
public void updateMainHand(GeyserSession session) {
122135
if (!valid)

src/main/java/me/zimzaza4/geyserdisplayentity/entity/SlotDisplayEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void setScale(EntityMetadata<Vector3f, ?> entityMetadata) {
114114
}
115115

116116

117-
private void applyScale() {
117+
protected void applyScale() {
118118
Vector3f vector3f = this.scale;
119119
float scale = (vector3f.getX() + vector3f.getY() + vector3f.getZ()) / 3;
120120
this.dirtyMetadata.put(EntityDataTypes.SCALE, scale);

0 commit comments

Comments
 (0)