Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/ch/zhaw/catan/Siedler.java
This commit is contained in:
Andrin Fassbind committed 2021-12-10 18:09:03 +01:00
commit 71899e8acc
4 files changed
+7 -7

No files matched your search

+1 -1
View File
@@ -72,7 +72,7 @@ public class SiedlerBoard extends HexBoard<Config.Land, Settlement, Road, String
*
* @return String of actual board.
*/
public String getTextView() {
public String toString() {
SiedlerBoardTextView view = new SiedlerBoardTextView(this);
for (Map.Entry<Point, Field> field : fields.entrySet()) {
view.setLowerFieldLabel(field.getKey(), field.getValue().getLabel());