Merge pull request #1373 from Nicofisi/patch-5

Fix player-specific weather
SkriptLang · Jul 15, 2018 · f11155d · f11155d
2 parents a6cc2a2 + 9ff29d8
commit f11155d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlayerWeather.java b/src/main/java/ch/njol/skript/expressions/ExprPlayerWeather.java
@@ -24,10 +24,10 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.util.WeatherType;
 import ch.njol.util.coll.CollectionUtils;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
@@ -71,13 +71,17 @@ public Class<?>[] acceptChange(final ChangeMode mode) {
 		return null;
 	}
 
-	@SuppressWarnings("null")
 	@Override
 	public void change(final Event e, final @Nullable Object[] delta, final ChangeMode mode) {
-		final WeatherType type = delta == null ? WeatherType.CLEAR : (WeatherType) delta[0];
-		for (final Player p : getExpr().getArray(e)) {
-			type.setWeather(p);
+		for (final Player player : getExpr().getArray(e)) {
+			switch (mode) {
+				case SET:
+					assert delta != null;
+					((WeatherType) delta[0]).setWeather(player);
+					break;
+				case RESET:
+					player.resetPlayerWeather();
+			}
 		}
 	}
-
 }
diff --git a/src/main/java/ch/njol/skript/util/WeatherType.java b/src/main/java/ch/njol/skript/util/WeatherType.java
@@ -122,6 +122,7 @@ public void setWeather(Player player) {
 			case RAIN:
 			case THUNDER:
 				player.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL);
+				break;
 			case CLEAR:
 			default:
 				player.setPlayerWeather(org.bukkit.WeatherType.CLEAR);