Merge pull request #1767 from Opachl/master

fix: no wether update after "/p flag remove weather"
This commit is contained in:
Alexander Söderberg 2017-11-18 14:15:29 +01:00 committed by GitHub
commit f27b12a211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -236,9 +236,13 @@ public class PlotListener {
if (plot.getFlag(Flags.TIME).isPresent()) { if (plot.getFlag(Flags.TIME).isPresent()) {
player.setTime(Long.MAX_VALUE); player.setTime(Long.MAX_VALUE);
} }
if (plot.getFlag(Flags.WEATHER).isPresent()) {
player.setWeather(PlotWeather.RESET); //always reset the weather on leave to default
} //Flags.WEATHER
//CASE: FLAG SET -> RESET -> Need update to World Weather
//CASE: FLAG NOT SET -> RESET -> Need update to World Weather. We could came from Plot.reEnter() which is used to update flag changes
player.setWeather(PlotWeather.RESET);
Location lastLoc = player.getMeta("music"); Location lastLoc = player.getMeta("music");
if (lastLoc != null) { if (lastLoc != null) {
player.deleteMeta("music"); player.deleteMeta("music");