Merge branch 'next-minor'

# Conflicts:
#	resources/vanilla
#	src/network/upnp/UPnP.php
This commit is contained in:
Dylan K. Taylor
2020-05-23 11:16:19 +01:00
6 changed files with 40 additions and 32 deletions

View File

@ -48,7 +48,7 @@ class UPnP implements NetworkInterface{
if(!Internet::$online){
throw new \RuntimeException("Server is offline");
}
if(Utils::getOS() !== "win"){
if(Utils::getOS() !== Utils::OS_WINDOWS){
throw new \RuntimeException("UPnP is only supported on Windows");
}
if(!class_exists("COM")){