Skip to content

Commit c67d897

Browse files
committed
Merge branch 'master' into mc26.1
2 parents 581dc50 + d4e03c0 commit c67d897

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

common/webapp/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/main/java/de/bluecolored/bluemap/core/BlueMap.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.spongepowered.configurate.ConfigurationNode;
2929
import org.spongepowered.configurate.gson.GsonConfigurationLoader;
3030

31+
import javax.imageio.ImageIO;
3132
import java.io.IOException;
3233
import java.util.concurrent.*;
3334

@@ -53,6 +54,9 @@ public class BlueMap {
5354

5455
VERSION = version;
5556
GIT_HASH = gitHash;
57+
58+
// global Java config
59+
ImageIO.setUseCache(false);
5660
}
5761

5862
public static final ForkJoinPool THREAD_POOL = new ForkJoinPool(

core/src/main/java/de/bluecolored/bluemap/core/map/renderstate/TileState.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434

3535
public interface TileState extends Keyed, TileActionResolver {
3636

37-
TileState UNKNOWN = new Impl( Key.bluemap("unknown"));
37+
TileState UNKNOWN = new Impl( Key.bluemap("unknown"), ((chunks, bounds) ->
38+
switch (bounds) {
39+
case INSIDE -> RENDER_RENDERED;
40+
case EDGE -> RENDER_RENDERED_EDGE;
41+
case OUTSIDE -> DELETE_OUT_OF_BOUNDS;
42+
}
43+
));
3844

3945
TileState RENDERED = new Impl(Key.bluemap("rendered"), (changed, bounds) ->
4046
switch (bounds) {

0 commit comments

Comments
 (0)