Skip to content

Commit e00206b

Browse files
committed
Update to dynmap 3.2 or later.
Fixes #40
1 parent 60bf195 commit e00206b

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

pom.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>de.lemaik.chunkymap</groupId>
86
<artifactId>ChunkyMap</artifactId>
9-
<version>2.5.2</version>
7+
<version>2.6.0-pre3</version>
108

119
<licenses>
1210
<license>
@@ -64,11 +62,17 @@
6462
<version>3.2</version>
6563
</dependency>
6664
<dependency>
67-
<!-- this is an older version, but 3.0-SNAPSHOT can't be installed and this works, too -->
6865
<groupId>us.dynmap</groupId>
6966
<artifactId>DynmapCore</artifactId>
70-
<version>2.3</version>
67+
<version>3.2.1</version>
7168
<scope>provided</scope>
69+
<exclusions>
70+
<exclusion>
71+
<!-- downloading fails -->
72+
<groupId>javax.servlet</groupId>
73+
<artifactId>javax.servlet-api</artifactId>
74+
</exclusion>
75+
</exclusions>
7276
</dependency>
7377
<dependency>
7478
<groupId>com.squareup.okhttp3</groupId>
@@ -174,4 +178,4 @@
174178
</resource>
175179
</resources>
176180
</build>
177-
</project>
181+
</project>

src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMapTile.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public ChunkyMapTile(DynmapWorld world, String parm) throws Exception {
5151

5252
@Override
5353
public boolean render(MapChunkCache mapChunkCache, String mapName) {
54+
final long startTimestamp = System.currentTimeMillis();
5455
IsoHDPerspective perspective = (IsoHDPerspective) this.perspective;
5556

5657
final int scaled = (boostzoom > 0 && MarkerAPIImpl
@@ -146,6 +147,7 @@ public boolean render(MapChunkCache mapChunkCache, String mapName) {
146147
mtile.getWriteLock();
147148
try {
148149
if (!mtile.matchesHashCode(crc)) {
150+
mtile.write(crc, image, startTimestamp);
149151
mapManager.pushUpdate(getDynmapWorld(), new Tile(mtile.getURI()));
150152
tileUpdated = true;
151153
}

0 commit comments

Comments
 (0)