Merge V3/release/3.0.0 into V3/develop

This commit is contained in:
Toby Harradine
2019-01-28 15:30:30 +11:00
committed by GitHub
69 changed files with 21563 additions and 81 deletions

View File

@@ -96,9 +96,12 @@ async def start_lavalink_server(loop):
if not java_available:
raise RuntimeError("You must install Java 1.8+ for Lavalink to run.")
extra_flags = ""
if java_version == (1, 8):
extra_flags = "-Dsun.zip.disableMemoryMapping=true"
elif java_version >= (11, 0):
extra_flags = "-Djdk.tls.client.protocols=TLSv1.2"
else:
extra_flags = ""
from . import LAVALINK_DOWNLOAD_DIR, LAVALINK_JAR_FILE