File tree Expand file tree Collapse file tree 3 files changed +9
-8
lines changed
common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8 Expand file tree Collapse file tree 3 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -324,11 +324,12 @@ public void register() {
324
324
public void register () {
325
325
handler (wrapper -> {
326
326
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 ) {
329
329
wrapper .cancel ();
330
- }
331
- wrapper .write (Types .VAR_INT , vehicle );
330
+ } else {
331
+ wrapper .write (Types .VAR_INT , vehicle );
332
+ }
332
333
});
333
334
map (Types .DOUBLE , Protocol1_9To1_8 .DOUBLE_TO_INT_TIMES_32 ); // X
334
335
map (Types .DOUBLE , Protocol1_9To1_8 .DOUBLE_TO_INT_TIMES_32 ); // Y
Original file line number Diff line number Diff line change @@ -421,9 +421,9 @@ public void register() {
421
421
final float forward = wrapper .passthrough (Types .FLOAT );
422
422
423
423
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 ());
425
425
426
- if (vehicle != - 1 && tracker .entityType (vehicle ) == EntityTypes1_9 .EntityType .BOAT ) {
426
+ if (vehicle != null && tracker .entityType (vehicle ) == EntityTypes1_9 .EntityType .BOAT ) {
427
427
final PacketWrapper paddleBoat = PacketWrapper .create (ServerboundPackets1_9 .PADDLE_BOAT , wrapper .user ());
428
428
paddleBoat .write (Types .BOOLEAN , forward != 0.0f || sideways < 0.0f );
429
429
paddleBoat .write (Types .BOOLEAN , forward != 0.0f || sideways > 0.0f );
Original file line number Diff line number Diff line change @@ -74,11 +74,11 @@ public boolean isInsideVehicle(final int id) {
74
74
return false ;
75
75
}
76
76
77
- public int getVehicle (final int passenger ) {
77
+ public Integer getVehicle (final int passenger ) {
78
78
for (Map .Entry <Integer , IntList > vehicle : vehicles .int2ObjectEntrySet ()) {
79
79
if (vehicle .getValue ().contains (passenger )) return vehicle .getKey ();
80
80
}
81
- return - 1 ;
81
+ return null ;
82
82
}
83
83
84
84
public Int2IntMap getStatus () {
You can’t perform that action at this time.
0 commit comments