Skip to content

Commit e27caba

Browse files
Cleanup code here and there
1 parent 07aab01 commit e27caba

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/PlayerPacketRewriter1_9.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,14 @@ public void register() {
280280
map(Types.DOUBLE); // Z
281281
map(Types.BOOLEAN); // On ground
282282
handler(wrapper -> {
283-
wrapper.user().get(PlayerPositionTracker.class).sendAnimations();
284-
285-
final PlayerPositionTracker pos = wrapper.user().get(PlayerPositionTracker.class);
286-
if (pos.getConfirmId() != -1) {
283+
final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
284+
storage.sendAnimations();
285+
if (storage.getConfirmId() != -1) {
287286
return;
288287
}
289-
pos.setPos(wrapper.get(Types.DOUBLE, 0), wrapper.get(Types.DOUBLE, 1), wrapper.get(Types.DOUBLE, 2));
290-
pos.setOnGround(wrapper.get(Types.BOOLEAN, 0));
288+
289+
storage.setPos(wrapper.get(Types.DOUBLE, 0), wrapper.get(Types.DOUBLE, 1), wrapper.get(Types.DOUBLE, 2));
290+
storage.setOnGround(wrapper.get(Types.BOOLEAN, 0));
291291
});
292292
handler(wrapper -> wrapper.user().get(BossBarStorage.class).updateLocation());
293293
}
@@ -300,13 +300,15 @@ public void register() {
300300
map(Types.FLOAT); // Pitch
301301
map(Types.BOOLEAN); // On ground
302302
handler(wrapper -> {
303-
wrapper.user().get(PlayerPositionTracker.class).sendAnimations();
303+
final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
304+
storage.sendAnimations();
305+
if (storage.getConfirmId() != -1) {
306+
return;
307+
}
304308

305-
PlayerPositionTracker pos = wrapper.user().get(PlayerPositionTracker.class);
306-
if (pos.getConfirmId() != -1) return;
307-
pos.setYaw(wrapper.get(Types.FLOAT, 0));
308-
pos.setPitch(wrapper.get(Types.FLOAT, 1));
309-
pos.setOnGround(wrapper.get(Types.BOOLEAN, 0));
309+
storage.setYaw(wrapper.get(Types.FLOAT, 0));
310+
storage.setPitch(wrapper.get(Types.FLOAT, 1));
311+
storage.setOnGround(wrapper.get(Types.BOOLEAN, 0));
310312
});
311313
handler(wrapper -> wrapper.user().get(BossBarStorage.class).updateLocation());
312314
}
@@ -320,7 +322,7 @@ public void register() {
320322
final float pitch = wrapper.passthrough(Types.FLOAT);
321323
final boolean onGround = wrapper.passthrough(Types.BOOLEAN);
322324

323-
PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
325+
final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
324326
storage.sendAnimations();
325327
if (storage.getConfirmId() != -1) {
326328
if (storage.getPosX() == x && storage.getPosY() == y && storage.getPosZ() == z && storage.getYaw() == yaw && storage.getPitch() == pitch) {

0 commit comments

Comments
 (0)