@@ -148,7 +148,19 @@ private void updateLocation() {
148
148
entityHeadLook .send (Protocol1_8To1_7_6_10 .class );
149
149
} else if (currentState == State .HOLOGRAM ) {
150
150
// Don't ask me where this offset is coming from
151
- teleportEntity (entityIds [0 ], locX , (locY + (marker ? 54.3625 : small ? 56 : 57 ) - 0.16 ), locZ , 0 , 0 ); // Skull
151
+ teleportEntity (entityIds [0 ], locX , (locY + getOffset ()), locZ , 0 , 0 ); // Skull
152
+ }
153
+ }
154
+
155
+ private double getOffset () {
156
+ double baseOffset = 54.35 ;
157
+
158
+ if (marker ) {
159
+ return baseOffset ;
160
+ } else if (small ) {
161
+ return baseOffset + 0.9875 ;
162
+ } else {
163
+ return baseOffset + (0.9875 * 2 );
152
164
}
153
165
}
154
166
@@ -256,13 +268,12 @@ public void sendSpawnPacket(final EntityPacketRewriter1_8 entityRewriter) {
256
268
entityIds = new int []{entityId };
257
269
} else if (currentState == State .HOLOGRAM ) {
258
270
final int [] entityIds = {entityId , additionalEntityId ()};
259
- final double offsetY = (locY + (marker ? 54.3625 : small ? 56 : 57 )) - 0.16 ;
260
271
261
272
final PacketWrapper spawnSkull = PacketWrapper .create (ClientboundPackets1_7_2_5 .ADD_ENTITY , user );
262
273
spawnSkull .write (Types .VAR_INT , entityIds [0 ]);
263
274
spawnSkull .write (Types .BYTE , (byte ) 66 );
264
275
spawnSkull .write (Types .INT , (int ) (locX * 32.0 ));
265
- spawnSkull .write (Types .INT , (int ) (offsetY * 32.0 ));
276
+ spawnSkull .write (Types .INT , (int ) (( locY + getOffset ()) * 32.0 ));
266
277
spawnSkull .write (Types .INT , (int ) (locZ * 32.0 ));
267
278
spawnSkull .write (Types .BYTE , (byte ) 0 );
268
279
spawnSkull .write (Types .BYTE , (byte ) 0 );
@@ -272,8 +283,8 @@ public void sendSpawnPacket(final EntityPacketRewriter1_8 entityRewriter) {
272
283
final List <EntityData > squidEntityData = new ArrayList <>();
273
284
squidEntityData .add (new EntityData (0 , EntityDataTypes1_8 .BYTE , (byte ) 32 ));
274
285
275
- spawnEntity (entityIds [0 ], EntityTypes1_8 .EntityType .SQUID .getId (), locX , offsetY , locZ , squidEntityData );
276
- spawnEntity (entityIds [1 ], EntityTypes1_8 .EntityType .HORSE .getId (), locX , offsetY + 0.74 , locZ , new ArrayList <>());
286
+ spawnEntity (entityIds [0 ], EntityTypes1_8 .EntityType .SQUID .getId (), locX , locY + getOffset () , locZ , squidEntityData );
287
+ spawnEntity (entityIds [1 ], EntityTypes1_8 .EntityType .HORSE .getId (), locX , locY + ( getOffset () + 0.68 ) , locZ , new ArrayList <>());
277
288
278
289
this .entityIds = entityIds ;
279
290
}
0 commit comments