peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-04-12 07:41:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: peet:9e199d677e21e6a8e4dae3a378474d5bbab203ad
Branches Tags
peet:main
peet:gui
peet:demo
peet:reworkedGui
peet:Testhandbuch
peet:logic
peet:connect
peet:client_logic
peet:b_szepielewicz_filip
peet:b_puderbach_luca
peet:b_wilkening_simon
peet:b_schmidt_yvonne
peet:b_schmelz_johannes
peet:revert-f248a77c
peet:b_Mueller_Tamino
peet:b_malkmus_dennis
peet:revert-71a4ac8d
peet:b_Schmelz_Johannes
...
compare: peet:7c79bb77e77cff540913540219bc04501313503c
Branches Tags
peet:main
peet:gui
peet:demo
peet:reworkedGui
peet:Testhandbuch
peet:logic
peet:connect
peet:client_logic
peet:b_szepielewicz_filip
peet:b_puderbach_luca
peet:b_wilkening_simon
peet:b_schmidt_yvonne
peet:b_schmelz_johannes
peet:revert-f248a77c
peet:b_Mueller_Tamino
peet:b_malkmus_dennis
peet:revert-71a4ac8d
peet:b_Schmelz_Johannes

2 Commits
9e199d677e ... 7c79bb77e7

Author SHA1 Message Date
Johannes Schmelz
7c79bb77e7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-12 16:13:55 +01:00
Johannes Schmelz
444cf9db4e fixed names in Player Popups 2024-12-12 16:13:50 +01:00
1 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -351,8 +351,8 @@ public class Player implements FieldVisitor<Void>{
int rent = field.calcRent(); int rent = field.calcRent();
field.getOwner().earnMoney(rent); field.getOwner().earnMoney(rent);
pay(rent); pay(rent);
sendRentNotification("ReceivedRent", field.getOwner(), rent); sendRentNotification("ReceivedRent", this, rent);
sendRentNotification("rent", this, rent); sendRentNotification("rent", field.getOwner(), rent);
} }
return null; return null;
} }
@ -369,8 +369,8 @@ public class Player implements FieldVisitor<Void>{
int rent = rollResult.calcTotal()*factor; int rent = rollResult.calcTotal()*factor;
field.getOwner().earnMoney(rent); field.getOwner().earnMoney(rent);
pay(rent); pay(rent);
sendRentNotification("ReceivedRent", field.getOwner(), rent); sendRentNotification("ReceivedRent", this, rent);
sendRentNotification("rent", this, rent); sendRentNotification("rent", field.getOwner(), rent);
} }
return null; return null;
} }
@ -384,8 +384,8 @@ public class Player implements FieldVisitor<Void>{
field.getOwner().earnMoney(rent); field.getOwner().earnMoney(rent);
pay(rent); pay(rent);
sendRentNotification("ReceivedRent", field.getOwner(), rent); sendRentNotification("ReceivedRent", this, rent);
sendRentNotification("rent", this, rent); sendRentNotification("rent", field.getOwner(), rent);
} }
return null; return null;
} }