peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-18 22:56:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed jailState

Browse Source
This commit is contained in:
Johannes Schmelz 2024-11-29 19:21:27 +01:00
parent afa2ebd004
commit fba82f670b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/Player.java
View File

@ -11,6 +11,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import javax.swing.JInternalFrame;
import com.jme3.network.serializing.Serializable;
import pp.monopoly.message.server.BuyPropertyRequest;
@ -336,7 +338,6 @@ public class Player implements FieldVisitor<Void>{
@Override
public Void visit(GulagField field) {
state = new JailState();
return null;
}
@ -358,6 +359,7 @@ public class Player implements FieldVisitor<Void>{
@Override
public Void visit(WacheField field) {
setPosition(10);
jail();
return null;
}
@ -386,6 +388,10 @@ public class Player implements FieldVisitor<Void>{
return properties;
}
public void jail() {
state = new JailState();
}
/**
* Return the number of Properties of the speciefied fild type
* @param field the type of field to search for

2
Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java
View File

@ -243,10 +243,12 @@ public class DeckHelper{
private void schimmelGulak(Player player) {
player.setPosition(10);
player.jail();
}
private void partynachtGulak(Player player) {
player.setPosition(10);
player.jail();
}
private void jahresabschlussantreten(Player player) {