OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-11 09:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-1235: Correctly validate MaterialData for playEffect.

Browse source 
Thanks Jikoo for the report / fix.
This commit is contained in:
md_5 2015-10-18 19:40:00 +11:00
parent f4c67a5c32
commit 18fbb24b46
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -826,7 +826,7 @@ public class CraftWorld implements World {
public <T> void playEffect(Location loc, Effect effect, T data, int radius) { public <T> void playEffect(Location loc, Effect effect, T data, int radius) {
if (data != null) { 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 { } else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
} }

2
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file

@ -325,7 +325,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public <T> void playEffect(Location loc, Effect effect, T data) { public <T> void playEffect(Location loc, Effect effect, T data) {
if (data != null) { 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 { } else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
} }