summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Zhao <ztuowen@gmail.com>2015-08-24 16:18:11 -0600
committerJoe Zhao <ztuowen@gmail.com>2015-08-24 16:18:11 -0600
commitf3e871ae516a214435847d681126dec40fe0432f (patch)
tree5213272a70e55ef4e06db862c0d4b12f26e32f62
parent96bc701ba7a01b940ad5910d85c7b6958ac4a141 (diff)
downloadMahjong-debug.tar.gz
Mahjong-debug.tar.bz2
Mahjong-debug.zip
stagedebug
-rw-r--r--aux/set/Hand.java17
-rw-r--r--engine/Engine.java2
-rw-r--r--player/CmdPlayerHandler.java2
3 files changed, 19 insertions, 2 deletions
diff --git a/aux/set/Hand.java b/aux/set/Hand.java
index a865a90..68866bb 100644
--- a/aux/set/Hand.java
+++ b/aux/set/Hand.java
@@ -85,4 +85,21 @@ public class Hand extends Set {
accountant.add(card,-1);
return gang;
}
+
+ public boolean isAble(Meld.Type type, Card card)
+ {
+ boolean res = false;
+ switch (type)
+ {
+ case Chi:
+ break;
+ case aGang:
+ break;
+ case jGang:
+ break;
+ case Peng:
+ break;
+ }
+ return res;
+ }
}
diff --git a/engine/Engine.java b/engine/Engine.java
index 7507ca1..8a022dc 100644
--- a/engine/Engine.java
+++ b/engine/Engine.java
@@ -46,7 +46,7 @@ public class Engine {
deck = Deck.generateDeck(true);
}
- public boolean sync4Player(int id)
+ public boolean syncPlayer(int id)
{
return (players[id].stateAlert(new Action(Action.Type.System, Action.Place.Info, Action.Act.Info,"Heartbeat")).getMessage().compareTo("ACK")==0);
}
diff --git a/player/CmdPlayerHandler.java b/player/CmdPlayerHandler.java
index 8d1e91b..4853d9b 100644
--- a/player/CmdPlayerHandler.java
+++ b/player/CmdPlayerHandler.java
@@ -22,7 +22,7 @@ public class CmdPlayerHandler implements PlayerActionHandler {
// System info
if (action.getPlace() == Action.Place.Info)
{
- if (action.getMessage().compareTo("") == 0)
+ if (action.getMessage().compareTo("") == 0);
}
else
switch (action.getPlace()) {