Merge commit '2eb62c85f69ebd22b36f29cfb513a579ea570b0c'

# Conflicts:
#	resources/vanilla
#	src/Server.php
This commit is contained in:
Dylan K. Taylor 2020-05-18 10:29:06 +01:00
commit 3795a13683

View File

@ -920,7 +920,7 @@ class Server{
$netCompressionThreshold = (int) $this->getProperty("network.batch-threshold", 256); $netCompressionThreshold = (int) $this->getProperty("network.batch-threshold", 256);
} }
$netCompressionLevel = $this->getProperty("network.compression-level", 7); $netCompressionLevel = (int) $this->getProperty("network.compression-level", 7);
if($netCompressionLevel < 1 or $netCompressionLevel > 9){ if($netCompressionLevel < 1 or $netCompressionLevel > 9){
$this->logger->warning("Invalid network compression level $netCompressionLevel set, setting to default 7"); $this->logger->warning("Invalid network compression level $netCompressionLevel set, setting to default 7");
$netCompressionLevel = 7; $netCompressionLevel = 7;