Merge branch 'playerProtection' into 'master'

Player: fixed Protection from everything

See merge request core-developers/forge!660
This commit is contained in:
Hans Mackowiak
2018-06-20 19:10:03 +00:00

View File

@@ -1181,6 +1181,8 @@ public class Player extends GameEntity implements Comparable<Player> {
if (source.isValid(characteristics, this, null, null)) {
return true;
}
} else if (kw.equals("Protection from everything")) {
return true;
}
else {
final boolean colorlessDamage = damageSource && source.hasKeyword("Colorless Damage Source");