issue #28: fixed NullPointerException that occured if the human player

tries to play a hand game
b0n541 · Oct 10, 2014 · ec33b51 · ec33b51
1 parent 9b97423
commit ec33b51
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/jskat-base/pom.xml b/jskat-base/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jskat</groupId>
 		<artifactId>jskat-multimodule</artifactId>
-		<version>0.14.1</version>
+		<version>0.14.2</version>
 	</parent>
 
 	<artifactId>jskat-base</artifactId>

diff --git a/jskat-swing-gui/pom.xml b/jskat-swing-gui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jskat</groupId>
 		<artifactId>jskat-multimodule</artifactId>
-		<version>0.14.1</version>
+		<version>0.14.2</version>
 	</parent>
 
 	<name>JSkat</name>

diff --git a/jskat-swing-gui/src/main/java/org/jskat/JSkat.java b/jskat-swing-gui/src/main/java/org/jskat/JSkat.java
@@ -45,7 +45,7 @@ public final class JSkat {
 
     private static final Logger LOG = LoggerFactory.getLogger(JSkat.class);
 
-    private static final String VERSION = "0.14.1"; //$NON-NLS-1$
+    private static final String VERSION = "0.14.2"; //$NON-NLS-1$
 
     /**
      * Main method

diff --git a/jskat-swing-gui/src/main/java/org/jskat/gui/human/SwingHumanPlayer.java b/jskat-swing-gui/src/main/java/org/jskat/gui/human/SwingHumanPlayer.java
@@ -372,12 +372,12 @@ public void startGame() {
 
     private void resetPlayer() {
         bidValue = 0;
-        holdBid = null;
-        playGrandHand = null;
-        callContra = null;
-        callRe = null;
+        holdBid = false;
+        playGrandHand = false;
+        callContra = false;
+        callRe = false;
         gameAnnouncementStep = GameAnnouncementStep.BEFORE_ANNOUNCEMENT;
-        pickUpSkat = null;
+        pickUpSkat = false;
         discardSkat = null;
         gameAnnouncement = null;
         nextCard = null;

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
 
 	<groupId>org.jskat</groupId>
 	<artifactId>jskat-multimodule</artifactId>
-	<version>0.14.1</version>
+	<version>0.14.2</version>
 	<name>Multi module for JSkat</name>
 	<packaging>pom</packaging>