gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-18 07:45:51 -08:00
Code Issues Packages Projects Releases Wiki Activity

don't remove pt! 🔥🔥🔥🔥 (#3606)

Browse Source 
* don't remove pt! 🔥🔥🔥🔥

* apply water to burns

* clangify

* fix clientside

* clangify

* missed qdebug

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
This commit is contained in:
ebbit1q
2019-03-04 06:55:54 +01:00
committed by Zach H
parent a86aeb00c5
commit abe4f5ca60
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/server_player.cpp
View File

@@ -587,11 +587,10 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
AttrTapped, "1");
}
QString ptString = QString::fromStdString(thisCardProperties->pt());
if (!faceDown) {
ptString = QString::fromStdString(thisCardProperties->pt());
if (!ptString.isEmpty()) {
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
AttrPT, ptString);
}
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(), AttrPT,
ptString);
}
if (startzone->getAlwaysRevealTopCard() && !startzone->getCards().isEmpty() && (originalPosition == 0)) {
Event_RevealCards revealEvent;