3
0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-12-26 16:12:43 +01:00

Fix vehicle exiting

Dieser Commit ist enthalten in:
Nassim Jahnke 2024-09-26 18:08:15 +02:00
Ursprung 8737b2b51a
Commit 49febd1e63
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
3 geänderte Dateien mit 65 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -26,6 +26,7 @@ import com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter.ComponentRewr
import com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter.EntityPacketRewriter1_21_2; import com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter.EntityPacketRewriter1_21_2;
import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.InventoryStateIdStorage; import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.InventoryStateIdStorage;
import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.ItemTagStorage; import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.ItemTagStorage;
import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.SneakingStorage;
import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@ -149,6 +150,7 @@ public final class Protocol1_21_2To1_21 extends BackwardsProtocol<ClientboundPac
addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_20_5.PLAYER)); addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_20_5.PLAYER));
user.put(new InventoryStateIdStorage()); user.put(new InventoryStateIdStorage());
user.put(new ItemTagStorage()); user.put(new ItemTagStorage());
user.put(new SneakingStorage());
} }
@Override @Override

Datei anzeigen

@ -20,6 +20,7 @@ package com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter;
import com.viaversion.nbt.tag.Tag; import com.viaversion.nbt.tag.Tag;
import com.viaversion.viabackwards.api.rewriters.EntityRewriter; import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21; import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21;
import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.SneakingStorage;
import com.viaversion.viaversion.api.minecraft.RegistryEntry; import com.viaversion.viaversion.api.minecraft.RegistryEntry;
import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_2; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_2;
@ -34,6 +35,7 @@ import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfi
import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_21; import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_21;
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2; import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2; import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.Key;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.BitSet; import java.util.BitSet;
@ -183,17 +185,26 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
entityMotionPacket.send(Protocol1_21_2To1_21.class); entityMotionPacket.send(Protocol1_21_2To1_21.class);
}); });
protocol.registerServerbound(ServerboundPackets1_20_5.PLAYER_COMMAND, wrapper -> {
wrapper.passthrough(Types.VAR_INT);
final int action = wrapper.passthrough(Types.VAR_INT);
if (action == 0) {
wrapper.user().get(SneakingStorage.class).setPlayerCommandTrackedSneaking(true);
} else if (action == 1) {
wrapper.user().get(SneakingStorage.class).setPlayerCommandTrackedSneaking(false);
}
});
// Now also sent by the player if not in a vehicle, but we can't emulate that here, and otherwise only used in predicates // Now also sent by the player if not in a vehicle, but we can't emulate that here, and otherwise only used in predicates
// TODO Why leaving vehicle no worky
protocol.registerServerbound(ServerboundPackets1_20_5.PLAYER_INPUT, wrapper -> { protocol.registerServerbound(ServerboundPackets1_20_5.PLAYER_INPUT, wrapper -> {
final float sideways = wrapper.read(Types.FLOAT); final float sideways = wrapper.read(Types.FLOAT);
final float forward = wrapper.read(Types.FLOAT); final float forward = wrapper.read(Types.FLOAT);
final byte flags = wrapper.read(Types.BYTE); final byte flags = wrapper.read(Types.BYTE);
byte updatedFlags = 0; byte updatedFlags = 0;
if (forward < 0) { if (forward > 0) {
updatedFlags |= 1; updatedFlags |= 1;
} else if (forward > 0) { } else if (forward < 0) {
updatedFlags |= 1 << 1; updatedFlags |= 1 << 1;
} }
@ -203,16 +214,29 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
updatedFlags |= 1 << 3; updatedFlags |= 1 << 3;
} }
if ((flags & 1) != 0) { if ((flags & 1) != 0) { // Jumping
updatedFlags |= 1 << 4; updatedFlags |= 1 << 4;
} }
if ((flags & 2) != 0) {
final boolean sneaking = (flags & 2) != 0;
if (sneaking) {
updatedFlags |= 1 << 5; updatedFlags |= 1 << 5;
} }
// Sprinting we don't know... // Sprinting we don't know...
wrapper.write(Types.BYTE, updatedFlags); wrapper.write(Types.BYTE, updatedFlags);
// Player input no longer sets the sneaking state on the server
// Send the change separately if needed (= when in a vehicle and player commands aren't sent by the old client)
final SneakingStorage sneakingStorage = wrapper.user().get(SneakingStorage.class);
if (sneakingStorage.setSneaking(sneaking)) {
final PacketWrapper playerCommandPacket = wrapper.create(ServerboundPackets1_21_2.PLAYER_COMMAND);
playerCommandPacket.write(Types.VAR_INT, tracker(wrapper.user()).clientEntityId());
playerCommandPacket.write(Types.VAR_INT, sneaking ? 0 : 1); // Start/stop sneaking
playerCommandPacket.write(Types.VAR_INT, 0); // Data
playerCommandPacket.sendToServer(Protocol1_21_2To1_21.class);
}
}); });
protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_POS, wrapper -> { protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_POS, wrapper -> {

Datei anzeigen

@ -0,0 +1,34 @@
/*
* This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
* Copyright (C) 2016-2024 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage;
import com.viaversion.viaversion.api.connection.StorableObject;
public final class SneakingStorage implements StorableObject {
private boolean playerCommandTrackedSneaking;
public void setPlayerCommandTrackedSneaking(final boolean playerCommandTrackedSneaking) {
this.playerCommandTrackedSneaking = playerCommandTrackedSneaking;
}
public boolean setSneaking(final boolean sneaking) {
final boolean changed = this.playerCommandTrackedSneaking != sneaking;
this.playerCommandTrackedSneaking = sneaking;
return changed;
}
}