flushing fix improved

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

Hide file tree

Showing 18 changed files with 9 additions and 6 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
@@ -47,4 +47,4 @@ C:\Devel\mc\110\build\sources\main\java
 
 BUILD SUCCESSFUL
 
-Total time: 34.344 secs
+Total time: 22.823 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
@@ -45,4 +45,4 @@ C:\Devel\mc\194\build\sources\main\java
 
 BUILD SUCCESSFUL
 
-Total time: 42.83 secs
+Total time: 23.371 secs
diff --git a/python2-scripts.zip b/python2-scripts.zip
diff --git a/python2-scripts/mcpipy/helloworld.py b/python2-scripts/mcpipy/helloworld.py
@@ -2,7 +2,7 @@
 import mcpi.block as block
 import server
 import sys
-mc = minecraft.Minecraft.create(server.address)
+mc = minecraft.Minecraft()
 mc.postToChat("Hello world!")
 playerPos = mc.player.getPos()
 mc.setBlock(playerPos.x,playerPos.y-1,playerPos.z,block.DIAMOND_ORE)
diff --git a/python2-scripts/mcpipy/mcpi/connection.py b/python2-scripts/mcpipy/mcpi/connection.py
@@ -19,6 +19,7 @@ class Connection:
     RequestFailed = "Fail"
 
     def __init__(self, address=None, port=None):
+        self.windows = (platform.system() == "Windows" or platform.system().startswith("CYGWIN_NT"))
         if address==None:
             try:
                  address = os.environ['MINECRAFT_API_HOST']
@@ -35,7 +36,6 @@ 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 self.windows:
             atexit.register(self.close)

diff --git a/python3-scripts.zip b/python3-scripts.zip
diff --git a/python3-scripts/mcpipy/helloworld.py b/python3-scripts/mcpipy/helloworld.py
@@ -2,7 +2,7 @@
 import mcpi.block as block
 import server
 import sys
-mc = minecraft.Minecraft.create(server.address)
+mc = minecraft.Minecraft()
 mc.postToChat("Hello world!")
 playerPos = mc.player.getPos()
 mc.setBlock(playerPos.x,playerPos.y-1,playerPos.z,block.DIAMOND_ORE)
diff --git a/python3-scripts/mcpipy/mcpi/connection.py b/python3-scripts/mcpipy/mcpi/connection.py
@@ -19,6 +19,7 @@ class Connection:
     RequestFailed = "Fail"
 
     def __init__(self, address=None, port=None):
+        self.windows = (platform.system() == "Windows" or platform.system().startswith("CYGWIN_NT"))
         if address==None:
             try:
                  address = os.environ['MINECRAFT_API_HOST']
@@ -35,7 +36,6 @@ 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 self.windows:
             atexit.register(self.close)
@@ -53,6 +53,9 @@ def close(self):
             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