Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-03 05:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1440 , Fixed #1446

Browse Source
This commit is contained in:
MattBDev 2016-11-26 11:55:38 -05:00
parent deb5441bcf
commit dc673f9715
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,11 +157,10 @@ public class MainUtil {
writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(filename)).append(CRLF); writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(filename)).append(CRLF);
writer.append("Content-Transfer-Encoding: binary").append(CRLF); writer.append("Content-Transfer-Encoding: binary").append(CRLF);
writer.append(CRLF).flush(); writer.append(CRLF).flush();
OutputStream nonClosable = new AbstractDelegateOutputStream(output) { writeTask.value = new AbstractDelegateOutputStream(output) {
@Override @Override
public void close() throws IOException { } // Don't close public void close() { } // Don't close
}; };
writeTask.value = nonClosable;
writeTask.run(); writeTask.run();
output.flush(); output.flush();
writer.append(CRLF).flush(); writer.append(CRLF).flush();
@ -486,11 +485,11 @@ public class MainUtil {
String[] split = arg.split(";|,"); String[] split = arg.split(";|,");
PlotId id; PlotId id;
if (split.length == 4) { if (split.length == 4) {
area = PS.get().getPlotAreaByString(split[0] + ";" + split[1]); area = PS.get().getPlotAreaByString(split[0] + ';' + split[1]);
id = PlotId.fromString(split[2] + ";" + split[3]); id = PlotId.fromString(split[2] + ';' + split[3]);
} else if (split.length == 3) { } else if (split.length == 3) {
area = PS.get().getPlotAreaByString(split[0]); area = PS.get().getPlotAreaByString(split[0]);
id = PlotId.fromString(split[1] + ";" + split[2]); id = PlotId.fromString(split[1] + ';' + split[2]);
} else if (split.length == 2) { } else if (split.length == 2) {
id = PlotId.fromString(arg); id = PlotId.fromString(arg);
} else { } else {
@ -688,7 +687,7 @@ public class MainUtil {
// Invalid // Invalid
return Collections.emptySet(); return Collections.emptySet();
} }
if (name.equals("*")) { if ("*".equals(name)) {
result.add(DBFunc.everyone); result.add(DBFunc.everyone);
continue; continue;
} }
@ -726,7 +725,7 @@ public class MainUtil {
String members = getPlayerList(plot.getMembers()); String members = getPlayerList(plot.getMembers());
String denied = getPlayerList(plot.getDenied()); String denied = getPlayerList(plot.getDenied());
String seen; String seen;
if (Settings.Enabled_Components.PLOT_EXPIRY) { if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
if (plot.isOnline()) { if (plot.isOnline()) {
seen = C.NOW.s(); seen = C.NOW.s();
} else { } else {