diff --git a/colorschemes/default.txt b/colorschemes/default.txt
index 0d8cc741..919f7a66 100644
--- a/colorschemes/default.txt
+++ b/colorschemes/default.txt
@@ -54,6 +54,8 @@ Powered Rail
 27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
 Detector Rail
 28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
+Sticky Piston
+29	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
 Cobweb
 30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
 Tall Grass
diff --git a/colorschemes/flames.txt b/colorschemes/flames.txt
index 13c3a049..e2af1042 100644
--- a/colorschemes/flames.txt
+++ b/colorschemes/flames.txt
@@ -54,6 +54,8 @@ Powered Rail
 27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
 Detector Rail
 28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
+Sticky Piston
+29	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
 Cobweb
 30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
 Tall Grass
diff --git a/colorschemes/ovocean.txt b/colorschemes/ovocean.txt
index c5bb3adc..5612a5f0 100644
--- a/colorschemes/ovocean.txt
+++ b/colorschemes/ovocean.txt
@@ -54,6 +54,8 @@ Powered Rail
 27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
 Detector Rail
 28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
+Sticky Piston
+29	157	128	79	255	125	122	116	255	78	64	39	255	88	85	81	255
 Cobweb
 30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
 Tall Grass
diff --git a/colorschemes/sk89q.txt b/colorschemes/sk89q.txt
index 6b30df05..0e66def4 100644
--- a/colorschemes/sk89q.txt
+++ b/colorschemes/sk89q.txt
@@ -25,6 +25,7 @@
 26	200	20	20	255	160	16	16	255	100	10	10	255	80	8	8	255
 27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
 28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
+29	109	80	60	255	111	108	98	255	76	56	41	255	111	108	98	255
 30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
 31	97	156	53	255	73	120	38	255	38	68	16	255	26	50	9	255
 32	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
diff --git a/src/main/java/org/dynmap/utils/FileLockManager.java b/src/main/java/org/dynmap/utils/FileLockManager.java
index 71048616..b7c3c600 100644
--- a/src/main/java/org/dynmap/utils/FileLockManager.java
+++ b/src/main/java/org/dynmap/utils/FileLockManager.java
@@ -72,7 +72,9 @@ public class FileLockManager {
         String fn = f.getPath();
         synchronized(lock) {
             boolean got_lock = false;
-            boolean first_wait = true;
+            long starttime = 0;
+            if(timeout > 0)
+                starttime = System.currentTimeMillis();
             while(!got_lock) {
                 Integer lockcnt = filelocks.get(fn);    /* Get lock count */
                 if(lockcnt == null) {
@@ -85,14 +87,16 @@ public class FileLockManager {
                 }
                 else {  /* Write lock in place */
                     try {
-                        if((timeout > 0) && (!first_wait)) {    /* We already waited */
-                            return false;
-                        }
-                        if(timeout < 0)
+                        if(timeout < 0) {
                             lock.wait();
-                        else
-                            lock.wait(timeout);
-                        first_wait = false;
+                        }
+                        else {
+                            long now = System.currentTimeMillis();
+                            long elapsed = now-starttime; 
+                            if(elapsed > timeout)   /* Give up on timeout */
+                                return false;
+                            lock.wait(timeout-elapsed);
+                        }
                     } catch (InterruptedException ix) {
                         Log.severe("getReadLock(" + fn + ") interrupted");
                         return false;