Skip to content

Commit bff1528

Browse files
Don't use -1 as indicator in EntityTracker1_9#getVehicle
1 parent e27caba commit bff1528

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ public void register() {
324324
public void register() {
325325
handler(wrapper -> {
326326
final EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
327-
final int vehicle = tracker.getVehicle(tracker.clientEntityId());
328-
if (vehicle == -1) {
327+
final Integer vehicle = tracker.getVehicle(tracker.clientEntityId());
328+
if (vehicle == null) {
329329
wrapper.cancel();
330330
}
331331
wrapper.write(Types.VAR_INT, vehicle);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ public void register() {
421421
final float forward = wrapper.passthrough(Types.FLOAT);
422422

423423
final EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
424-
final int vehicle = tracker.getVehicle(tracker.clientEntityId());
424+
final Integer vehicle = tracker.getVehicle(tracker.clientEntityId());
425425

426-
if (vehicle != -1 && tracker.entityType(vehicle) == EntityTypes1_9.EntityType.BOAT) {
426+
if (vehicle != null && tracker.entityType(vehicle) == EntityTypes1_9.EntityType.BOAT) {
427427
final PacketWrapper paddleBoat = PacketWrapper.create(ServerboundPackets1_9.PADDLE_BOAT, wrapper.user());
428428
paddleBoat.write(Types.BOOLEAN, forward != 0.0f || sideways < 0.0f);
429429
paddleBoat.write(Types.BOOLEAN, forward != 0.0f || sideways > 0.0f);

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/storage/EntityTracker1_9.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public boolean isInsideVehicle(final int id) {
7474
return false;
7575
}
7676

77-
public int getVehicle(final int passenger) {
77+
public Integer getVehicle(final int passenger) {
7878
for (Map.Entry<Integer, IntList> vehicle : vehicles.int2ObjectEntrySet()) {
7979
if (vehicle.getValue().contains(passenger)) return vehicle.getKey();
8080
}
81-
return -1;
81+
return null;
8282
}
8383

8484
public Int2IntMap getStatus() {

0 commit comments

Comments
 (0)