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

update NPE prevention

Browse Source
This commit is contained in:
Anthony Calosa
2024-11-03 12:14:43 +08:00
parent 4a1bbdc3ba
commit 74f9d05b08
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java
View File

@@ -78,13 +78,19 @@ public class CCombat implements ICDoc {
} }
display.append("\n"); display.append("\n");
PlayerView controller = null;
if (defender instanceof CardView) { if (defender instanceof CardView) {
final PlayerView controller = ((CardView) defender).getController(); controller = ((CardView) defender).getController();
display.append(Lang.getInstance().getPossesive(controller.getName())).append(" "); if (controller == null)
//shouldn't be null but display card's + controller ie Black Knight's controller
display.append(Lang.getInstance().getPossesive(defender.getName())).append(" controller");
else
display.append(Lang.getInstance().getPossesive(controller.getName())).append(" ");
} }
if (controller == null)
display.append(defender).append(" is attacked by:\n"); display.append(" is attacked by:\n");
else
display.append(defender).append(" is attacked by:\n");
// Associate Bands, Attackers Blockers // Associate Bands, Attackers Blockers
boolean previousBand = false; boolean previousBand = false;

9
forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
View File

@@ -66,12 +66,11 @@ public class VZoneDisplay extends VCardDisplayArea {
} }
private void setRevealedPanel(int idx) { private void setRevealedPanel(int idx) {
try { if (idx >= 0 && idx < cardPanels().size())
revealedPanel = cardPanels().get(idx); //on network match, when zoomed and cast a card would randomly trigger the bug revealedPanel = cardPanels().get(idx);
} catch (Exception e) { //before it was arrayindexoutofbounds, then indexoutofbounds, so just use a general exception else
//e.printStackTrace();
return; return;
}
clearChildren(); clearChildren();
if (Forge.isLandscapeMode()) { if (Forge.isLandscapeMode()) {
//for landscape mode, just show revealed card on top //for landscape mode, just show revealed card on top