Compare commits

...
4 Commits
Author SHA1 Message Date
LexManos e08c63b57b Merge pull request #1184 from bspkrs/patch-2
Fix config category names being quoted to many times.
2014-07-02 14:55:03 -07:00
LexManos db1e2c863d Merge pull request #1192 from bloodmc/mc172
Fixed wrong method call in ChunkIOProvider.
2014-06-29 14:56:10 -07:00
bloodshot ea7be67db2 Fixed wrong method call in ChunkIOProvider.
When a chunk fails to load async, we fallback to the original sync method.
In this case, it was calling the async method twice which ended up causing
a stackoverflow.
2014-06-29 14:31:53 -04:00
bspkrs 6144650579 dupe quotes fix for category names 2014-06-26 16:43:17 -04:00
2 changed files with 6 additions and 4 deletions

No files matched your search

@@ -34,7 +34,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
public void callStage2(QueuedChunk queuedChunk, net.minecraft.world.chunk.Chunk chunk) throws RuntimeException { public void callStage2(QueuedChunk queuedChunk, net.minecraft.world.chunk.Chunk chunk) throws RuntimeException {
if(chunk == null) { if(chunk == null) {
// If the chunk loading failed just do it synchronously (may generate) // If the chunk loading failed just do it synchronously (may generate)
queuedChunk.provider.loadChunk(queuedChunk.x, queuedChunk.z); queuedChunk.provider.originalLoadChunk(queuedChunk.x, queuedChunk.z);
return; return;
} }
@@ -271,12 +271,14 @@ public class ConfigCategory implements Map<String, Property>
write(out, pad0, COMMENT_SEPARATOR, NEW_LINE); write(out, pad0, COMMENT_SEPARATOR, NEW_LINE);
} }
String displayName = name;
if (!allowedProperties.matchesAllOf(name)) if (!allowedProperties.matchesAllOf(name))
{ {
name = '"' + name + '"'; displayName = '"' + name + '"';
} }
write(out, pad0, name, " {"); write(out, pad0, displayName, " {");
Property[] props = getOrderedValues().toArray(new Property[] {}); Property[] props = getOrderedValues().toArray(new Property[] {});
@@ -421,4 +423,4 @@ public class ConfigCategory implements Map<String, Property>
changed = true; changed = true;
} }
} }
} }