peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge commit

Browse Source
This commit is contained in:
Felix Koppe
2024-12-09 03:17:47 +01:00
parent 3dd6fc9f37 3ae9028b82
commit 3a1b17ed01
6 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
View File

@@ -172,8 +172,8 @@ private void handleGame(Notification notification) {
} else if (notification instanceof ThrowPieceNotification n) {
boardHandler.throwPiece(n.getPieceId(), n.getThrowColor());
waitForAnimation = true;
} else if (notification instanceof NoShieldNotification n) {
boardHandler.unshieldPiece(n.getPieceId());
} else if (notification instanceof RemoveShieldNotification n) {
boardHandler.unshieldPiece(n.getPieceUuid());
} else if (notification instanceof PlayCardNotification n) {
if(n.getCard() == BonusCard.TURBO) {
guiHandler.turbo();

1
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
View File

@@ -529,7 +529,6 @@ private void throwPiece(UUID uuid){
* @param uuid the UUID of the piece to shield
*/
public void shieldPiece(UUID uuid){
pieces.get(uuid).activateShield();
}

1
Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java
View File

@@ -113,6 +113,7 @@ public Vector3f getLocation(){
protected void controlUpdate(float delta) {
if(shieldRing != null){
shieldRing.rotate(0, 0, delta * SHIELD_SPEED);
shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0,0,SHIELD_Z)));
}
}