mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 03:08:02 +00:00
- Fixing NPE in IsPlayer()
This commit is contained in:
@@ -67,11 +67,6 @@ public class AIPlayer extends Player {
|
||||
return true;
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public boolean isPlayer(Player p1) {
|
||||
return p1.getName().equals(this.name);
|
||||
}
|
||||
|
||||
///////////////
|
||||
///
|
||||
/// End transition methods
|
||||
|
||||
@@ -68,7 +68,7 @@ public class HumanPlayer extends Player {
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public boolean isPlayer(Player p1) {
|
||||
return p1.getName().equals(this.name);
|
||||
return p1 != null && p1.getName().equals(this.name);
|
||||
}
|
||||
|
||||
///////////////
|
||||
|
||||
@@ -127,7 +127,9 @@ public abstract class Player extends MyObservable {
|
||||
* @param p1 a {@link forge.Player} object.
|
||||
* @return a boolean.
|
||||
*/
|
||||
public abstract boolean isPlayer(Player p1);
|
||||
public boolean isPlayer(Player p1) {
|
||||
return p1 != null && p1.getName().equals(this.name);
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>getOpponent.</p>
|
||||
|
||||
Reference in New Issue
Block a user