diff options
| author | md_5 <git@md-5.net> | 2015-10-18 19:40:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-10-18 19:40:00 +1100 |
| commit | 18fbb24b46427e2b41d3715a79f829b356b05ed5 (patch) | |
| tree | 741ebdbf23c764731cb6128dc1bd0bd9d902b130 /src/main/java | |
| parent | f4c67a5c3264098dbd3a3a26bc1a352d84c13fe1 (diff) | |
| download | craftbukkit-18fbb24b46427e2b41d3715a79f829b356b05ed5.tar craftbukkit-18fbb24b46427e2b41d3715a79f829b356b05ed5.tar.gz craftbukkit-18fbb24b46427e2b41d3715a79f829b356b05ed5.tar.lz craftbukkit-18fbb24b46427e2b41d3715a79f829b356b05ed5.tar.xz craftbukkit-18fbb24b46427e2b41d3715a79f829b356b05ed5.zip | |
SPIGOT-1235: Correctly validate MaterialData for playEffect.
Thanks Jikoo for the report / fix.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 2bbbdd37..d4c1a123 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -826,7 +826,7 @@ public class CraftWorld implements World { public <T> void playEffect(Location loc, Effect effect, T data, int radius) { if (data != null) { - Validate.isTrue(data.getClass().equals(effect.getData()), "Wrong kind of data for this effect!"); + Validate.isTrue(data.getClass().isAssignableFrom(effect.getData()), "Wrong kind of data for this effect!"); } else { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 40f52f1e..bffb0389 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -325,7 +325,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public <T> void playEffect(Location loc, Effect effect, T data) { if (data != null) { - Validate.isTrue(data.getClass().equals(effect.getData()), "Wrong kind of data for this effect!"); + Validate.isTrue(data.getClass().isAssignableFrom(effect.getData()), "Wrong kind of data for this effect!"); } else { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } |