diff --git a/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index f4734f822..9f23d5da8 100644 --- a/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -1,5 +1,5 @@ ---- ../vanillamcp/src-reference/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../vanillamcp/src-work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 +--- src-reference/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 ++++ src-work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 @@ -13,6 +13,9 @@ import java.util.Random; import java.util.logging.Level; diff --git a/fml/update_patches.py b/fml/update_patches.py index 14a95c7c2..039d8c27d 100644 --- a/fml/update_patches.py +++ b/fml/update_patches.py @@ -29,7 +29,7 @@ def main(): print("Creating patches") base = 'src-reference' work = 'src-work' - patched_dir=os.path.join(sys.argv[1],work) + patched_dir=os.path.normpath(os.path.join(sys.argv[1],work)) timestamp = re.compile(r'[0-9-]* [0-9:\.]* [+-][0-9]*\r?\n') for path, _, filelist in os.walk(patched_dir, followlinks=True): @@ -40,7 +40,7 @@ def main(): cmd = 'diff -u %s %s -r --strip-trailing-cr --new-file' % (file_base, file_work) process = subprocess.Popen(cmdsplit(cmd), cwd=os.path.normpath(sys.argv[1]), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1) patch, _ = process.communicate() - patch_dir = os.path.join(sys.argv[2],'patches', path[len(work)+1:]) + patch_dir = os.path.join(sys.argv[2],path[len(patched_dir)+1:]) patch_file = os.path.join(patch_dir, cur_file + '.patch') if len(patch) > 0: