external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'playerProtection' into 'master'

Browse Source 
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
parent 58275457de 785c8ecdd8
commit f5c119e27c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/player/Player.java
View File

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