From 8d98fbfd5725827aa787e959c6298b7e31f99268 Mon Sep 17 00:00:00 2001 From: downthecrop Date: Thu, 16 Jun 2022 23:20:07 +0000 Subject: [PATCH] Intentionally burning seaweed->soda ash will now stop at specified Make-X --- .../node/entity/skill/cooking/IntentionalBurnPulse.java | 6 +++++- .../node/entity/skill/cooking/StandardCookingPulse.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java index 632ee7f62..bd4e8f8ea 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java @@ -30,8 +30,12 @@ public class IntentionalBurnPulse extends StandardCookingPulse { } if(cook(player,null,false,initial,product)) { amount--; + } else { + return true; } - return amount < 1; + // we are always one off a normal cooking pulse because + // the first tick is handled outside of this class. + return amount <= 1; } @Override diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java index bbe0e7c69..f5b110f35 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java @@ -53,7 +53,7 @@ public class StandardCookingPulse extends Pulse { @Override public boolean pulse() { - if (!checkRequirements()) { + if (amount < 1 || !checkRequirements()) { return true; } return reward();