Mirror von
https://github.com/PaperMC/Velocity.git
synchronisiert 2024-11-17 05:20:14 +01:00
Merge branch 'PaperMC:dev/3.0.0' into dev/3.0.0
Dieser Commit ist enthalten in:
Commit
79b33c0e5a
@ -86,7 +86,7 @@ public enum ProtocolVersion implements Ordered<ProtocolVersion> {
|
||||
MINECRAFT_1_20(763, "1.20", "1.20.1"),
|
||||
MINECRAFT_1_20_2(764, "1.20.2"),
|
||||
MINECRAFT_1_20_3(765, "1.20.3", "1.20.4"),
|
||||
MINECRAFT_1_20_5(766, "1.20.5");
|
||||
MINECRAFT_1_20_5(766, "1.20.5", "1.20.6");
|
||||
|
||||
private static final int SNAPSHOT_BIT = 30;
|
||||
|
||||
|
@ -195,8 +195,9 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
|
||||
boolean isQuietDecoderException = cause instanceof QuietDecoderException;
|
||||
boolean willLog = !isQuietDecoderException && !frontlineHandler;
|
||||
if (willLog) {
|
||||
logger.error("{}: exception encountered in {}", association, activeSessionHandler,
|
||||
cause);
|
||||
logger.atError().withThrowable(cause)
|
||||
.log("{}: exception encountered in {}", association,
|
||||
activeSessionHandler);
|
||||
} else {
|
||||
knownDisconnect = true;
|
||||
}
|
||||
@ -226,7 +227,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
|
||||
* Writes and immediately flushes a message to the connection.
|
||||
*
|
||||
* @param msg the message to write
|
||||
*
|
||||
* @return A {@link ChannelFuture} that will complete when packet is successfully sent
|
||||
*/
|
||||
@Nullable
|
||||
|
@ -55,7 +55,7 @@ public class SessionCommandHandler implements CommandHandler<SessionPlayerComman
|
||||
+ "Contact your network administrator."));
|
||||
}
|
||||
// We seemingly can't actually do this if signed args exist, if not, we can probs keep stuff happy
|
||||
if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_19_3)) {
|
||||
if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_19_3) && packet.lastSeenMessages != null) {
|
||||
return CompletableFuture.completedFuture(new ChatAcknowledgementPacket(packet.lastSeenMessages.getOffset()));
|
||||
}
|
||||
return CompletableFuture.completedFuture(null);
|
||||
|
@ -166,8 +166,10 @@ public class VelocityTabList implements InternalTabList {
|
||||
return entry;
|
||||
});
|
||||
|
||||
if (!actions.isEmpty()) {
|
||||
this.connection.write(new UpsertPlayerInfoPacket(actions, List.of(playerInfoEntry)));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<TabListEntry> removeEntry(UUID uuid) {
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren