xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Return empty chunk in case of null and come back indent for ProcessingQueue, sorry! :)

Browse Source
This commit is contained in:
Prototik 2015-10-22 01:45:44 +07:00
parent c9caa8c770
commit ad909f2788
2 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
View File

@ -250,9 +250,9 @@
+ Chunk chunk = (Chunk) this.loadedChunkHashMap_KC.get(LongHash.toLong(p_73154_1_, p_73154_2_));
+ chunk = chunk == null ? (shouldLoadChunk() ? this.loadChunk(p_73154_1_, p_73154_2_) : this.defaultEmptyChunk) : chunk; // Cauldron handle forge server tick events and load the chunk within 5 seconds of the world being loaded (for chunk loaders)
+
+ if (chunk == this.defaultEmptyChunk || chunk == null)
+ if (chunk == defaultEmptyChunk || chunk == null)
+ {
+ return chunk;
+ return defaultEmptyChunk;
+ }
+
+ if ((p_73154_1_ != chunk.xPosition || p_73154_2_ != chunk.zPosition) && !worldObj.isProfilingWorld())

200
src/main/java/kcauldron/wrapper/ProcessingQueue.java
View File

@ -6,119 +6,119 @@ import java.util.Queue;
import java.util.concurrent.atomic.AtomicInteger;
public class ProcessingQueue<T> extends QueueWrapper<T> {
public class ProcessingIterator implements Iterator<T> {
private Iterator<T> mRealIterator = mCollection.iterator();
public class ProcessingIterator implements Iterator<T> {
private Iterator<T> mRealIterator = mCollection.iterator();
@Override
public boolean hasNext() {
return mRealIterator.hasNext();
}
@Override
public boolean hasNext() {
return mRealIterator.hasNext();
}
@Override
public T next() {
return mRealIterator.next();
}
@Override
public T next() {
return mRealIterator.next();
}
@Override
public void remove() {
mRealIterator.remove();
mSize.decrementAndGet();
}
}
@Override
public void remove() {
mRealIterator.remove();
mSize.decrementAndGet();
}
}
private final AtomicInteger mSize;
private final AtomicInteger mSize;
@Override
public boolean add(T e) {
boolean result = super.add(e);
if (result) {
mSize.incrementAndGet();
}
return result;
};
@Override
public boolean add(T e) {
boolean result = super.add(e);
if (result) {
mSize.incrementAndGet();
}
return result;
};
@Override
public boolean offer(T e) {
boolean result = super.offer(e);
if (result) {
mSize.incrementAndGet();
}
return result;
}
@Override
public boolean offer(T e) {
boolean result = super.offer(e);
if (result) {
mSize.incrementAndGet();
}
return result;
}
@Override
public boolean addAll(Collection<? extends T> c) {
boolean result = false;
for (T t : c) {
result |= add(t);
}
return result;
}
@Override
public boolean addAll(Collection<? extends T> c) {
boolean result = false;
for (T t : c) {
result |= add(t);
}
return result;
}
@Override
public T remove() {
T result = super.remove();
mSize.decrementAndGet();
return result;
}
@Override
public T remove() {
T result = super.remove();
mSize.decrementAndGet();
return result;
}
@Override
public boolean remove(Object o) {
boolean result = super.remove(o);
if (result) {
mSize.decrementAndGet();
}
return result;
}
@Override
public boolean remove(Object o) {
boolean result = super.remove(o);
if (result) {
mSize.decrementAndGet();
}
return result;
}
@Override
public boolean removeAll(Collection<?> c) {
boolean result = false;
for (Object t : c) {
result |= remove(t);
}
return result;
}
@Override
public boolean removeAll(Collection<?> c) {
boolean result = false;
for (Object t : c) {
result |= remove(t);
}
return result;
}
@Override
public boolean retainAll(Collection<?> c) {
boolean result = super.retainAll(c);
if (result) {
mSize.set(mCollection.size());
}
return result;
}
@Override
public boolean retainAll(Collection<?> c) {
boolean result = super.retainAll(c);
if (result) {
mSize.set(mCollection.size());
}
return result;
}
@Override
public T poll() {
T result = super.remove();
if (result != null) {
mSize.decrementAndGet();
}
return result;
}
@Override
public T poll() {
T result = super.remove();
if (result != null) {
mSize.decrementAndGet();
}
return result;
}
public ProcessingQueue(Queue<T> collection) {
super(collection);
mSize = new AtomicInteger(collection.size());
}
public ProcessingQueue(Queue<T> collection) {
super(collection);
mSize = new AtomicInteger(collection.size());
}
@Override
public ProcessingIterator iterator() {
return new ProcessingIterator();
}
@Override
public ProcessingIterator iterator() {
return new ProcessingIterator();
}
@Override
public String toString() {
if (size() == 0)
return "[]";
StringBuilder builder = new StringBuilder();
for (T t : this) {
builder.append(',');
builder.append(t == null ? "null" : t.getClass().getSimpleName());
}
builder.setCharAt(0, '[');
builder.append(']');
return builder.toString();
}
@Override
public String toString() {
if (size() == 0)
return "[]";
StringBuilder builder = new StringBuilder();
for (T t : this) {
builder.append(',');
builder.append(t == null ? "null" : t.getClass().getSimpleName());
}
builder.setCharAt(0, '[');
builder.append(']');
return builder.toString();
}
}