From 7b1c644a08325f3e5c05cfc9bf31dee92c027a70 Mon Sep 17 00:00:00 2001 From: punchready Date: Sun, 25 Jul 2021 23:14:09 +0200 Subject: [PATCH] fix: power stone doesn't send a value --- .../teamname/marvelous/gamelibrary/gamelogic/GameLogic.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java index 509cba2..cdf3acd 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java @@ -146,10 +146,6 @@ public class GameLogic { requireAlive(target); requireOppositeTeam(origin, target); - - if(origin.meleeDamage * 2 != data.value) { - throw new InvalidRequestException("Invalid power stone damage"); - } } case TimeStone -> { // "👍 i approve" - the server @@ -472,7 +468,7 @@ public class GameLogic { result.add(new EventBuilder(EventType.TakenDamageEvent) .withTargetEntity(data.targetEntity) .withTargetField(data.targetField) - .withAmount(data.value) + .withAmount(origin.meleeDamage * 2) .buildEntityEvent()); } case TimeStone -> {