13
0
geforkt von Mirrors/Velocity

Merge branch 'master' into dev/1.1.0

Dieser Commit ist enthalten in:
Andrew Steinborn 2019-06-22 21:01:46 -04:00
Commit ed8209cfd1
3 geänderte Dateien mit 13 neuen und 7 gelöschten Zeilen

Datei anzeigen

@ -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 Velocity with many hundreds of concurrent players online, but your mileage
may vary. 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 and SpongeVanilla. Minecraft Forge is fully supported but mod compatibility
may vary. Generally, Velocity will support many mods better than BungeeCord may vary. Generally, Velocity will support many mods better than BungeeCord
or Waterfall do but compatibility can not always be ensured. or Waterfall do but compatibility can not always be ensured.

Datei anzeigen

@ -29,7 +29,8 @@ public enum ProtocolVersion {
MINECRAFT_1_13_2(404, "1.13.2"), MINECRAFT_1_13_2(404, "1.13.2"),
MINECRAFT_1_14(477, "1.14"), MINECRAFT_1_14(477, "1.14"),
MINECRAFT_1_14_1(480, "1.14.1"), 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 int protocol;
private final String name; private final String name;

Datei anzeigen

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