external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-12 16:58:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

This list doesn't need to be instantiated like an array

Browse Source
This commit is contained in:
Chris H
2025-01-12 20:09:51 -05:00
committed by Hans Mackowiak
parent b8b2fd40d7
commit 2ce91a04f1
8 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/Game.java
View File

@@ -593,7 +593,7 @@ public class Game {
} }
public Zone getZoneOf(final Card card) { public Zone getZoneOf(final Card card) {
return card.getLastKnownZone(); return card == null ? null : card.getLastKnownZone();
} }
public synchronized CardCollectionView getCardsIn(final ZoneType zone) { public synchronized CardCollectionView getCardsIn(final ZoneType zone) {

2
forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
View File

@@ -291,7 +291,7 @@ public final class SRearrangingUtil {
} }
// Remove old cell if necessary, or, enforce rough bounds on new cell. // Remove old cell if necessary, or, enforce rough bounds on new cell.
if (cellSrc.getDocs().size() == 0) { if (cellSrc.getDocs().isEmpty()) {
fillGap(); fillGap();
FView.SINGLETON_INSTANCE.removeDragCell(cellSrc); FView.SINGLETON_INSTANCE.removeDragCell(cellSrc);
} }

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
View File

@@ -184,6 +184,10 @@ public enum CDeckEditorUI implements ICDoc {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void addSelectedCards(final boolean toAlternate, final int number) { public void addSelectedCards(final boolean toAlternate, final int number) {
if (childController == null || childController.getCatalogManager() == null) {
return;
}
moveSelectedItems(childController.getCatalogManager(), new _MoveAction() { moveSelectedItems(childController.getCatalogManager(), new _MoveAction() {
@Override public <T extends InventoryItem> void move(final Iterable<Entry<T, Integer>> items) { @Override public <T extends InventoryItem> void move(final Iterable<Entry<T, Integer>> items) {
((ACEditorBase<T, ?>)childController).addItems(items, toAlternate); ((ACEditorBase<T, ?>)childController).addItems(items, toAlternate);

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

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

3
forge-gui-desktop/src/main/java/forge/screens/match/views/VCombat.java
View File

@@ -104,10 +104,9 @@ public class VCombat implements IVDoc<CCombat> {
//========= Observer update methods //========= Observer update methods
/** @param s0 &emsp; {@link java.lang.String} */
public void updateCombat(final int cntAttackers, final String desc) { public void updateCombat(final int cntAttackers, final String desc) {
// No need to update this unless it's showing // No need to update this unless it's showing
if (!this.equals(parentCell.getSelected())) { return; } if (parentCell == null || !this.equals(parentCell.getSelected())) { return; }
tab.setText(cntAttackers > 0 ? (Localizer.getInstance().getMessage("lblCombatTab") + " : " + cntAttackers) : Localizer.getInstance().getMessage("lblCombatTab")); tab.setText(cntAttackers > 0 ? (Localizer.getInstance().getMessage("lblCombatTab") + " : " + cntAttackers) : Localizer.getInstance().getMessage("lblCombatTab"));
tar.setText(desc); tar.setText(desc);

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
View File

@@ -135,7 +135,7 @@ public class VLog implements IVDoc<CLog> {
} }
private boolean isGameLogConsoleVisible() { private boolean isGameLogConsoleVisible() {
return parentCell.getSelected().equals(this); return parentCell != null && parentCell.getSelected().equals(this);
} }
private void resetDisplayIfNewGame(final GameView model) { private void resetDisplayIfNewGame(final GameView model) {

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
View File

@@ -123,7 +123,7 @@ public class VStack implements IVDoc<CStack> {
tab.setText(Localizer.getInstance().getMessage("lblStack") + " : " + items.size()); tab.setText(Localizer.getInstance().getMessage("lblStack") + " : " + items.size());
// No need to update the rest unless it's showing // No need to update the rest unless it's showing
if (!parentCell.getSelected().equals(this)) { return; } if (parentCell == null || !parentCell.getSelected().equals(this)) { return; }
hoveredItem = null; hoveredItem = null;
scroller.removeAll(); scroller.removeAll();

2
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
View File

@@ -278,7 +278,7 @@ public abstract class CardPanelContainer extends SkinnedPanel {
public final CardPanel getCardPanel(final int gameCardID) { public final CardPanel getCardPanel(final int gameCardID) {
for (final CardPanel panel : this.getCardPanels()) { for (final CardPanel panel : this.getCardPanels()) {
if (panel.getCard().getId() == gameCardID) { if (panel.getCard() != null && panel.getCard().getId() == gameCardID) {
return panel; return panel;
} }
} }