Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'alron/master'

Browse source
This commit is contained in:
FrozenCow 2011-03-15 16:53:12 +01:00
commit 15abae9f94
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pom.xml
View file

@ -37,11 +37,9 @@
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.nijikokun.bukkit.Permissions.Permissions</groupId> <groupId>com.nijikokun.bukkit.Permissions</groupId>
<artifactId>Permissions</artifactId> <artifactId>Permissions</artifactId>
<version>2.1</version> <version>2.5.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/../Permissions.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <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; import org.dynmap.debug.Debug;
public class DefaultTileRenderer implements MapTileRenderer { 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; private String name;
protected int maximumHeight = 127; protected int maximumHeight = 127;
private ColorScheme colorScheme; 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.fields.put("Content-Length", Integer.toString(cachedConfiguration.length));
response.status = HttpStatus.OK; response.status = HttpStatus.OK;
BufferedOutputStream out = new BufferedOutputStream(response.getBody()); BufferedOutputStream out = null;
out.write(cachedConfiguration); try {
out.flush(); 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.fields.put(HttpField.ContentLength, Integer.toString(bytes.length));
response.status = HttpStatus.OK; response.status = HttpStatus.OK;
BufferedOutputStream out = new BufferedOutputStream(response.getBody()); BufferedOutputStream out = null;
out.write(bytes); try {
out.flush(); out = new BufferedOutputStream(response.getBody());
out.write(bytes);
out.flush();
}
finally
{
out.close();
}
} }
} }