MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Snapshot 20w46a

Browse Source
This commit is contained in:
Five (Xer)
2020-11-11 20:12:47 +01:00
committed by FivePB
parent d444bed96b
commit d8a39fc438
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
View File

@@ -54,7 +54,7 @@ public enum ProtocolVersion {
MINECRAFT_1_16_2(751, "1.16.2"),
MINECRAFT_1_16_3(753, "1.16.3"),
MINECRAFT_1_16_4(754, "1.16.4", "1.16.5"),
MINECRAFT_1_17(-1, 5, "1.17"); // Note: Indev as of 20w45a (754, borked by Mojang)
MINECRAFT_1_17(-1, 6, "1.17"); // Note: Indev as of 20w45a (754, borked by Mojang)
private static final int SNAPSHOT_BIT = 30;

4
api/src/main/java/com/velocitypowered/api/proxy/Player.java
View File

@@ -226,7 +226,9 @@ public interface Player extends CommandSource, Identified, InboundConnection,
* @param url the URL for the resource pack
* @param hash the SHA-1 hash value for the resource pack
*/
void sendResourcePack(String url, byte[] hash);
default void sendResourcePack(String url, byte[] hash) {
sendResourcePack(url, hash, false);
}
/**
* <strong>Note that this method does not send a plugin message to the server the player

5
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@@ -891,11 +891,6 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
}
}
@Override
public void sendResourcePack(String url, byte[] hash) {
sendResourcePack(url, hash, false);
}
/**
* Sends a {@link KeepAlive} packet to the player with a random ID.
* The response will be ignored by Velocity as it will not match the