Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1131

This commit is contained in:
Jesse Boyd 2016-09-14 10:12:44 +10:00
parent b6dac54677
commit 0286a7b046
4 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Core/src/main/java/com/intellectualcrafters/plot/object/stream/AbstractDelegateOutputStream.java Normal file
View File

@ -0,0 +1,38 @@
package com.intellectualcrafters.plot.object.stream;
import java.io.IOException;
import java.io.OutputStream;
public class AbstractDelegateOutputStream extends OutputStream {
private final OutputStream parent;
@Override
public void write(int b) throws IOException {
parent.write(b);
}
@Override
public void write(byte[] b) throws IOException {
parent.write(b);
}
@Override
public void write(byte[] b, int off, int len) throws IOException {
parent.write(b, off, len);
}
@Override
public void flush() throws IOException {
parent.flush();
}
@Override
public void close() throws IOException {
parent.close();
}
public AbstractDelegateOutputStream(OutputStream os) {
this.parent = os;
}
}

7
Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -16,6 +16,7 @@ import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.object.stream.AbstractDelegateOutputStream;
import com.intellectualcrafters.plot.util.expiry.ExpireManager;
import java.io.File;
@ -156,7 +157,11 @@ public class MainUtil {
writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(filename)).append(CRLF);
writer.append("Content-Transfer-Encoding: binary").append(CRLF);
writer.append(CRLF).flush();
writeTask.value = output;
OutputStream nonClosable = new AbstractDelegateOutputStream(output) {
@Override
public void close() throws IOException { } // Don't close
};
writeTask.value = nonClosable;
writeTask.run();
output.flush();
writer.append(CRLF).flush();

10
Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
View File

@ -527,11 +527,11 @@ public abstract class SchematicHandler {
@Override
public void run(OutputStream output) {
try {
GZIPOutputStream gzip = new GZIPOutputStream(output, true);
NBTOutputStream nos = new NBTOutputStream(gzip);
nos.writeTag(tag);
nos.flush();
gzip.flush();
try (GZIPOutputStream gzip = new GZIPOutputStream(output, true)) {
try (NBTOutputStream nos = new NBTOutputStream(gzip)) {
nos.writeTag(tag);
}
}
} catch (IOException e) {
e.printStackTrace();
}

9
Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java
View File

@ -29,6 +29,7 @@ import cn.nukkit.event.block.BlockSpreadEvent;
import cn.nukkit.event.block.BlockUpdateEvent;
import cn.nukkit.event.entity.EntityBlockChangeEvent;
import cn.nukkit.event.entity.EntityCombustByEntityEvent;
import cn.nukkit.event.entity.EntityCombustEvent;
import cn.nukkit.event.entity.EntityDamageByEntityEvent;
import cn.nukkit.event.entity.EntityDamageEvent;
import cn.nukkit.event.entity.EntityExplodeEvent;
@ -148,9 +149,11 @@ public class PlayerEvents extends PlotListener implements Listener {
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
EntityDamageByEntityEvent eventChange = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(), EntityDamageEvent.CAUSE_FIRE_TICK, event.getDuration());
onEntityDamageByEntityEvent(eventChange);
public void onEntityCombustByEntity(EntityCombustEvent event) {
if (event instanceof EntityCombustByEntityEvent) {
EntityDamageByEntityEvent eventChange = new EntityDamageByEntityEvent(((EntityCombustByEntityEvent) event).getCombuster(), event.getEntity(), EntityDamageEvent.CAUSE_FIRE_TICK, event.getDuration());
onEntityDamageByEntityEvent(eventChange);
}
}
@EventHandler(priority = EventPriority.HIGHEST)