flushing

arpruss · Jun 26, 2016 · 4954f0a · 4954f0a
1 parent b85792d
commit 4954f0a
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 12 deletions.
diff --git a/110/.gradle/2.7/taskArtifacts/cache.properties.lock b/110/.gradle/2.7/taskArtifacts/cache.properties.lock
diff --git a/110/.gradle/2.7/taskArtifacts/fileHashes.bin b/110/.gradle/2.7/taskArtifacts/fileHashes.bin
diff --git a/110/.gradle/2.7/taskArtifacts/fileSnapshots.bin b/110/.gradle/2.7/taskArtifacts/fileSnapshots.bin
diff --git a/110/.gradle/2.7/taskArtifacts/outputFileStates.bin b/110/.gradle/2.7/taskArtifacts/outputFileStates.bin
diff --git a/110/.gradle/2.7/taskArtifacts/taskArtifacts.bin b/110/.gradle/2.7/taskArtifacts/taskArtifacts.bin
diff --git a/110/.gradle/gradle.log b/110/.gradle/gradle.log
@@ -39,13 +39,12 @@ Note: Recompile with -Xlint:unchecked for details.
 :reobfJar
 :extractRangemapReplacedMain
 C:\Devel\mc\110\build\sources\main\java
-:retromapReplacedMain
-remapping source...
+:retromapReplacedMain UP-TO-DATE
 :sourceJar
 :assemble
 :check UP-TO-DATE
 :build
 
 BUILD SUCCESSFUL
 
-Total time: 58.23 secs
+Total time: 34.344 secs
diff --git a/194/.gradle/2.7/taskArtifacts/cache.properties.lock b/194/.gradle/2.7/taskArtifacts/cache.properties.lock
diff --git a/194/.gradle/2.7/taskArtifacts/fileHashes.bin b/194/.gradle/2.7/taskArtifacts/fileHashes.bin
diff --git a/194/.gradle/2.7/taskArtifacts/fileSnapshots.bin b/194/.gradle/2.7/taskArtifacts/fileSnapshots.bin
diff --git a/194/.gradle/2.7/taskArtifacts/outputFileStates.bin b/194/.gradle/2.7/taskArtifacts/outputFileStates.bin
diff --git a/194/.gradle/2.7/taskArtifacts/taskArtifacts.bin b/194/.gradle/2.7/taskArtifacts/taskArtifacts.bin
diff --git a/194/.gradle/gradle.log b/194/.gradle/gradle.log
@@ -37,13 +37,12 @@ Note: Recompile with -Xlint:unchecked for details.
 :reobfJar
 :extractRangemapReplacedMain
 C:\Devel\mc\194\build\sources\main\java
-:retromapReplacedMain
-remapping source...
+:retromapReplacedMain UP-TO-DATE
 :sourceJar
 :assemble
 :check UP-TO-DATE
 :build
 
 BUILD SUCCESSFUL
 
-Total time: 58.6 secs
+Total time: 42.83 secs
diff --git a/python2-scripts.zip b/python2-scripts.zip
diff --git a/python2-scripts/mcpipy/mcpi/connection.py b/python2-scripts/mcpipy/mcpi/connection.py
@@ -35,12 +35,13 @@ def __init__(self, address=None, port=None):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.connect((address, port))
         self.readFile = self.socket.makefile("r")
+        self.windows = (platform.system() == "Windows" or platform.system().startswith("CYGWIN_NT"))
         self.lastSent = ""
-        if platform.system() == "Windows":
+        if self.windows:
             atexit.register(self.close)
 
     def __del__(self):
-        if platform.system() == "Windows":
+        if self.windows:
             self.close()
             try:
                 atexit.unregister(self.close)
@@ -49,9 +50,12 @@ def __del__(self):
 
     def close(self):
         try:
-            if platform.system() == "Windows":
+            if self.windows:
                 # ugly hack to block until all sending is completed
                 self.sendReceive("world.getBlock",0,0,0)
+        except:
+            pass
+        try:
             self.socket.close()
         except:
             pass

diff --git a/python3-scripts.zip b/python3-scripts.zip
diff --git a/python3-scripts/mcpipy/mcpi/connection.py b/python3-scripts/mcpipy/mcpi/connection.py
@@ -35,12 +35,13 @@ def __init__(self, address=None, port=None):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.connect((address, port))
         self.readFile = self.socket.makefile("r")
+        self.windows = (platform.system() == "Windows" or platform.system().startswith("CYGWIN_NT"))
         self.lastSent = ""
-        if platform.system() == "Windows":
+        if self.windows:
             atexit.register(self.close)
 
     def __del__(self):
-        if platform.system() == "Windows":
+        if self.windows:
             self.close()
             try:
                 atexit.unregister(self.close)
@@ -49,7 +50,7 @@ def __del__(self):
 
     def close(self):
         try:
-            if platform.system() == "Windows":
+            if self.windows:
                 # ugly hack to block until all sending is completed
                 self.sendReceive("world.getBlock",0,0,0)
             self.socket.close()