Index: head/games/minecraft-server/Makefile
===================================================================
--- head/games/minecraft-server/Makefile	(revision 476165)
+++ head/games/minecraft-server/Makefile	(revision 476166)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	minecraft-server
-PORTVERSION=	1.12.2
+PORTVERSION=	1.13
 CATEGORIES=	games java
-MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
-DISTFILES=	minecraft_server.${PORTVERSION}.jar
+MASTER_SITES=	https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/
+DISTFILES=	server.jar
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	freebsd@jonathanprice.org
 COMMENT=	Dedicated server for the game Minecraft
 
 LICENSE=	minecraft
 LICENSE_NAME=	Minecraft End User License Agreement
 LICENSE_TEXT=	The license can be viewed at: https://account.mojang.com/documents/minecraft_eula
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 OPTIONS_SINGLE=		RUN
 OPTIONS_SINGLE_RUN=	DAEMON STANDALONE
 
 DAEMON_DESC=		Run as a service
 STANDALONE_DESC=	Run the .jar file directly
 OPTIONS_SUB=		yes
 
 OPTIONS_DEFAULT=	STANDALONE
 
 USERS=		mcserver
 GROUPS=		${USERS}
 
 NO_BUILD=	yes
 USE_JAVA=	yes
 SUB_FILES=	minecraft-server \
 		pkg-message \
 		pkg-deinstall
 SUB_LIST=	VERSION=${PORTVERSION}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 CONFIG_FILES=	banned-ips.json \
 		banned-players.json \
 		eula.txt \
 		ops.json \
 		server.properties \
 		usercache.json \
 		whitelist.json
 
 DAEMON_VARS=	USE_RC_SUBR=minecraft
 DAEMON_RUN_DEPENDS=	tmux:sysutils/tmux
 
 NO_ARCH=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
 .for file in ${CONFIG_FILES}
 	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
 .endfor
 	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
 	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
 	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
-	${LN} -sf ${PREFIX}/${PORTNAME}/${DISTFILES} ${STAGEDIR}${PREFIX}/${PORTNAME}/minecraft_server.jar
 
 post-install-STANDALONE-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
 	${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
Index: head/games/minecraft-server/distinfo
===================================================================
--- head/games/minecraft-server/distinfo	(revision 476165)
+++ head/games/minecraft-server/distinfo	(revision 476166)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514732045
-SHA256 (minecraft_server.1.12.2.jar) = fe1f9274e6dad9191bf6e6e8e36ee6ebc737f373603df0946aafcded0d53167e
-SIZE (minecraft_server.1.12.2.jar) = 30222121
+TIMESTAMP = 1533069013
+SHA256 (minecraft-server-1.13/server.jar) = e76f3927904d331c969a2c437d5661ac02f24be86062dd1c607bfd4ebdc550b9
+SIZE (minecraft-server-1.13/server.jar) = 32649675
Index: head/games/minecraft-server/files/minecraft-server.in
===================================================================
--- head/games/minecraft-server/files/minecraft-server.in	(revision 476165)
+++ head/games/minecraft-server/files/minecraft-server.in	(revision 476166)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if [ "$(id -u)" != "0" ]; then
 	echo "$0 must be run as root" 1>&2
 	exit 1
 fi
 
 cd %%PREFIX%%/minecraft-server
-su -m mcserver -c "java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar minecraft_server.%%VERSION%%.jar nogui"
+su -m mcserver -c "java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui"
Index: head/games/minecraft-server/files/minecraft.in
===================================================================
--- head/games/minecraft-server/files/minecraft.in	(revision 476165)
+++ head/games/minecraft-server/files/minecraft.in	(revision 476166)
@@ -1,109 +1,109 @@
 #!/bin/sh
 #
 # $FreeBSD$
 # PROVIDE: minecraft
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # rc.conf variables:
 # minecraft_enable (Default: NO)
 # minecraft_mems (Default: 1024M)
 # minecraft_memx (Default: 1024M)
 # minecraft_args (Default: "")
 . /etc/rc.subr
 
 name=minecraft
 rcvar=minecraft_enable
 desc="Dedicated server for the game Minecraft"
 
 load_rc_config $name
 
 minecraft_mems=${minecraft_mems:-"1024M"}
 minecraft_memx=${minecraft_memx:-"1024M"}
 minecraft_args=${minecraft_args:-""}
 
 extra_commands="console status kill"
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 console_cmd="${name}_console"
 status_cmd="${name}_status"
 kill_cmd="${name}_kill"
 
 is_running()
 {
 	pgrep -qu mcserver java
 	return $?
 }
 
 minecraft_start()
 {
 	if is_running; then
 		echo "${name} is already running."
 	elif [ ${minecraft_mems%?} -gt ${minecraft_memx%?} ]; then
 		echo "ERROR: minecraft_mems is set greater than minecraft_memx."
 		echo "ERROR: Set minecraft_memx to be equal or greater than minecraft_mems in rc.conf."
 	else
 		if [ -n "${minecraft_mem}" ]; then
 			echo "WARNING: minecraft_mem is deprecated. Please change this to minecraft_memx."
 			minecraft_memx=${minecraft_mem}
 		fi
 		echo "Starting ${name}."
 		cd %%PREFIX%%/minecraft-server
-		su mcserver -c "%%LOCALBASE%%/bin/tmux new-session -s minecraft -d '%%LOCALBASE%%/bin/java -Xmx${minecraft_memx} -Xms${minecraft_mems} ${minecraft_args} -jar %%PREFIX%%/minecraft-server/minecraft_server.%%VERSION%%.jar nogui'"
+		su mcserver -c "%%LOCALBASE%%/bin/tmux new-session -s minecraft -d '%%LOCALBASE%%/bin/java -Xmx${minecraft_memx} -Xms${minecraft_mems} ${minecraft_args} -jar %%PREFIX%%/minecraft-server/server.jar nogui'"
 	fi
 }
 
 minecraft_stop()
 {
 	if is_running; then
 		echo "Stopping ${name}."
 		su mcserver -c "%%LOCALBASE%%/bin/tmux send-keys -t ${name} \"stop\" ENTER"
 
 		i=0
 		while [ $i -lt 10 ]; do
 			i=$(($i + 1))
 			if is_running; then
 				sleep 1
 			else
 				echo "${name} has been stopped."
 				return
 			fi
 		done
 		echo "WARN: ${name} could not be stopped or is taking longer than expected."
 		echo "WARN: To view the console, type 'service ${name} console'"
 		echo "WARN: To kill ${name}, type 'service ${name} kill'"
 	else
 		echo "${name} is not running."
 	fi
 }
 
 minecraft_console()
 {
 	if ! is_running; then
 		echo "${name} is not running."
 	else
 		export TERM=xterm
 		su mcserver -c "%%LOCALBASE%%/bin/tmux attach-session -t ${name}"
 	fi
 }
 
 minecraft_status()
 {
 	if is_running; then
 		echo "${name} is running."
 	else
 		echo "${name} is not running."
 	fi
 }
 
 minecraft_kill()
 {
 	if ! is_running; then
 		echo "${name} is not running."
 	else
 		pkill -KILL -u mcserver java
 		echo "${name} has been killed."
 	fi
 }
 
 run_rc_command "$1"
Index: head/games/minecraft-server/pkg-plist
===================================================================
--- head/games/minecraft-server/pkg-plist	(revision 476165)
+++ head/games/minecraft-server/pkg-plist	(revision 476166)
@@ -1,22 +1,21 @@
 %%STANDALONE%%bin/minecraft-server
 @owner mcserver
 @group mcserver
 %%STANDALONE%%%%ETCDIR%%/java-args.txt
 minecraft-server/banned-ips.json
 minecraft-server/banned-players.json
 minecraft-server/debug
 minecraft-server/eula.txt
 minecraft-server/logs
-minecraft-server/minecraft_server.jar
-minecraft-server/minecraft_server.%%VERSION%%.jar
+minecraft-server/server.jar
 minecraft-server/ops.json
 minecraft-server/server.properties
 minecraft-server/usercache.json
 minecraft-server/whitelist.json
 minecraft-server/world
 @dir %%ETCDIR%%
 @dir minecraft-server
 @dir /var/db/minecraft-server
 @dir /var/log/minecraft-server
 @owner
 @group