Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 05:05:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'alron/master'

Browse Source
This commit is contained in:
FrozenCow 2011-03-15 16:53:12 +01:00
commit 437e82387b
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -37,11 +37,9 @@
</build>
<dependencies>
<dependency>
<groupId>com.nijikokun.bukkit.Permissions.Permissions</groupId>
<groupId>com.nijikokun.bukkit.Permissions</groupId>
<artifactId>Permissions</artifactId>
<version>2.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/../Permissions.jar</systemPath>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>

2
src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
View File

@ -14,7 +14,7 @@ import org.dynmap.ColorScheme;
import org.dynmap.debug.Debug;
public class DefaultTileRenderer implements MapTileRenderer {
protected static Color translucent = new Color(0, 0, 0, 0);
protected static final Color translucent = new Color(0, 0, 0, 0);
private String name;
protected int maximumHeight = 127;
private ColorScheme colorScheme;

13
src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java
View File

@ -32,8 +32,15 @@ public class ClientConfigurationHandler implements HttpHandler {
response.fields.put("Content-Length", Integer.toString(cachedConfiguration.length));
response.status = HttpStatus.OK;
BufferedOutputStream out = new BufferedOutputStream(response.getBody());
out.write(cachedConfiguration);
out.flush();
BufferedOutputStream out = null;
try {
out = new BufferedOutputStream(response.getBody());
out.write(cachedConfiguration);
out.flush();
}
finally
{
out.close();
}
}
}

13
src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
View File

@ -87,8 +87,15 @@ public class ClientUpdateHandler implements HttpHandler {
response.fields.put(HttpField.ContentLength, Integer.toString(bytes.length));
response.status = HttpStatus.OK;
BufferedOutputStream out = new BufferedOutputStream(response.getBody());
out.write(bytes);
out.flush();
BufferedOutputStream out = null;
try {
out = new BufferedOutputStream(response.getBody());
out.write(bytes);
out.flush();
}
finally
{
out.close();
}
}
}