Revert "Hopefully display correct amounts on objective completion"

This reverts commit a6d101329d.
And added other changes.
This commit is contained in:
AlessioDP 2019-09-12 10:41:48 +02:00
parent a6d101329d
commit 946fccaaa6
No known key found for this signature in database
GPG Key ID: B92B813840FFCC9F

View File

@ -1457,6 +1457,7 @@ public class Quester {
getQuestData(quest).itemsEnchanted.put(entry.getKey(), num);
if (num.equals(entry2.getValue())) {
final ItemStack finalToEnchant = new ItemStack(m, entry.getValue());
finishObjective(quest, "enchantItem", new ItemStack(m, 1), finalToEnchant, e, null, null, null, null, null, null, null);
// Multiplayer
@ -1526,7 +1527,8 @@ public class Quester {
* @param quest The quest for which the fish is being caught
*/
public void catchFish(Quest quest) {
if (getQuestData(quest).getFishCaught() < getCurrentStage(quest).fishToCatch) {
final int fishToCatch = getCurrentStage(quest).fishToCatch;
if (getQuestData(quest).getFishCaught() < fishToCatch) {
getQuestData(quest).setFishCaught(getQuestData(quest).getFishCaught() + 1);
final int fishToCatch = getCurrentStage(quest).fishToCatch;
if (getQuestData(quest).getFishCaught() == fishToCatch) {