From 685aecddac71ec6faf2f42dc8f4ba6689b0fd5ae Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 26 Feb 2013 14:34:51 -0800 Subject: [PATCH] Fixup reobfusication of server code if present. --- fml/commands.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fml/commands.patch b/fml/commands.patch index a83379470..eaa076453 100644 --- a/fml/commands.patch +++ b/fml/commands.patch @@ -13,7 +13,7 @@ binlk = {CLIENT: self.binclient, SERVER: self.binserver} testlk = {CLIENT: self.testclient, SERVER: self.testserver} -+ if side == SERVER: ++ if side == SERVER and not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))): + return self.checkbins(CLIENT) if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))): return False @@ -22,7 +22,7 @@ pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog} -+ if side == SERVER: #Disable server because FML recombines it into client ++ if side == SERVER and not os.path.exists(pathbinlk[side]): #Disable server because FML recombines it into client + self.logger.info('Server side recompiling skipped, this is normal') + return +