mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-27 06:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/1.1.0

Browse Source
This commit is contained in:
Andrew Steinborn 2019-06-22 21:01:46 -04:00
commit ed8209cfd1
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -42,7 +42,7 @@ Velocity is currently in beta. Production networks are successfully running
Velocity with many hundreds of concurrent players online, but your mileage
may vary.
Velocity supports Minecraft 1.8-1.14.2. Velocity is best supported with Paper
Velocity supports Minecraft 1.8-1.14.3-pre4. Velocity is best supported with Paper
and SpongeVanilla. Minecraft Forge is fully supported but mod compatibility
may vary. Generally, Velocity will support many mods better than BungeeCord
or Waterfall do but compatibility can not always be ensured.

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

@ -29,7 +29,8 @@ public enum ProtocolVersion {
MINECRAFT_1_13_2(404, "1.13.2"),
MINECRAFT_1_14(477, "1.14"),
MINECRAFT_1_14_1(480, "1.14.1"),
MINECRAFT_1_14_2(485, "1.14.2");
MINECRAFT_1_14_2(485, "1.14.2"),
MINECRAFT_1_14_3(489, "1.14.3-pre4");
private final int protocol;
private final String name;

5
native/src/main/java/com/velocitypowered/natives/encryption/NativeVelocityCipher.java
View File

@ -56,11 +56,16 @@ public class NativeVelocityCipher implements VelocityCipher {
int len = source.readableBytes();
ByteBuf out = ctx.alloc().directBuffer(len);
try {
impl.process(this.ctx, source.memoryAddress() + source.readerIndex(), len,
out.memoryAddress(), encrypt);
source.skipBytes(len);
out.writerIndex(len);
return out;
} catch (Exception e) {
out.release();
throw e;
}
}
@Override