diff --git a/src/common/nallar/tickthreading/global/ThreadLocals.java b/src/common/nallar/tickthreading/global/ThreadLocals.java index 5fcfabab..2a3925d7 100644 --- a/src/common/nallar/tickthreading/global/ThreadLocals.java +++ b/src/common/nallar/tickthreading/global/ThreadLocals.java @@ -5,6 +5,8 @@ import java.util.HashSet; import java.util.LinkedList; +import nallar.tickthreading.util.BooleanThreadLocal; + @SuppressWarnings ("UnusedDeclaration") public class ThreadLocals { public static final ThreadLocal redPowerBlockUpdateSet = new HashSetThreadLocal(); @@ -55,16 +57,6 @@ protected Object initialValue() { } } - private static class BooleanThreadLocal extends ThreadLocal { - BooleanThreadLocal() { - } - - @Override - protected Object initialValue() { - return Boolean.FALSE; - } - } - public static class MapChunkTempByteArrayThreadLocal extends ThreadLocal { @Override public byte[] initialValue() { diff --git a/src/common/nallar/tickthreading/util/BooleanThreadLocal.java b/src/common/nallar/tickthreading/util/BooleanThreadLocal.java index c3675fcf..46317e0e 100644 --- a/src/common/nallar/tickthreading/util/BooleanThreadLocal.java +++ b/src/common/nallar/tickthreading/util/BooleanThreadLocal.java @@ -30,7 +30,6 @@ public Boolean initialValue() { @Override public void set(Boolean value) { if (value == get()) { - Log.severe("Pointless repeat set on threadlocal", new Throwable()); return; } super.set(value); @@ -42,7 +41,7 @@ public void set(Boolean value) { return; } } while (true); - } else if (value == Boolean.FALSE) { + } else { do { int old = $.getIntVolatile(this, index); int next = old - 1; @@ -50,8 +49,6 @@ public void set(Boolean value) { return; } } while (true); - } else { - throw new Error("Must use Boolean.TRUE/FALSE."); } } @@ -74,7 +71,7 @@ public Boolean getAndSet(Boolean value) { return oldValue; } } while (true); - } else if (value == Boolean.FALSE) { + } else { do { int old = $.getIntVolatile(this, index); int next = old - 1; @@ -82,8 +79,6 @@ public Boolean getAndSet(Boolean value) { return oldValue; } } while (true); - } else { - throw new Error("Must use Boolean.TRUE/FALSE."); } }