EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Added snow-melt flag

Browse Source
This commit is contained in:
Matt 2016-03-14 11:01:52 -04:00
parent bee6f83e79
commit bb8883dfaf
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java
View File

@ -57,7 +57,7 @@ import java.util.UUID;
* *
*/ */
@SuppressWarnings({ "deprecation" }) @SuppressWarnings("deprecation")
public class PlotPlusListener extends PlotListener implements Listener { public class PlotPlusListener extends PlotListener implements Listener {
private final static HashMap<String, Interval> feedRunnable = new HashMap<>(); private final static HashMap<String, Interval> feedRunnable = new HashMap<>();
private final static HashMap<String, Interval> healRunnable = new HashMap<>(); private final static HashMap<String, Interval> healRunnable = new HashMap<>();
@ -122,6 +122,9 @@ public class PlotPlusListener extends PlotListener implements Listener {
if (!FlagManager.isBooleanFlag(plot, "ice-melt", false)) { if (!FlagManager.isBooleanFlag(plot, "ice-melt", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
if (FlagManager.isPlotFlagFalse(plot, "snow-melt")) {
event.setCancelled(true);
}
} }
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)

1
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -1951,6 +1951,7 @@ public class PS {
FlagManager.addFlag(new AbstractFlag("use", new FlagValue.PlotBlockListValue())); FlagManager.addFlag(new AbstractFlag("use", new FlagValue.PlotBlockListValue()));
FlagManager.addFlag(new AbstractFlag("blocked-cmds", new FlagValue.StringListValue())); FlagManager.addFlag(new AbstractFlag("blocked-cmds", new FlagValue.StringListValue()));
FlagManager.addFlag(new AbstractFlag("ice-melt", new FlagValue.BooleanValue())); FlagManager.addFlag(new AbstractFlag("ice-melt", new FlagValue.BooleanValue()));
FlagManager.addFlag(new AbstractFlag("snow-melt", new FlagValue.BooleanValue()));
FlagManager.addFlag(new AbstractFlag("keep") { FlagManager.addFlag(new AbstractFlag("keep") {
@Override @Override
public Object parseValueRaw(final String value) { public Object parseValueRaw(final String value) {