From 740e9f6b0abcbc4187dff486514963284ad3f078 Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Wed, 21 Apr 2021 18:48:12 -0700
Subject: [PATCH] fix types in servertagbase and revoke_advancement

---
 .../java/com/denizenscript/denizen/objects/PlayerTag.java   | 2 +-
 .../com/denizenscript/denizen/tags/core/ServerTagBase.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
index 3216605819..d8b7cb13a0 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -2551,7 +2551,7 @@ public void adjust(Mechanism mechanism) {
                 return;
             }
             AdvancementProgress prog = getPlayerEntity().getAdvancementProgress(adv);
-            for (String criteria : prog.getRemainingCriteria()) {
+            for (String criteria : prog.getAwardedCriteria()) {
                 prog.revokeCriteria(criteria);
             }
         }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
index 421298ff79..bc574722ec 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -273,7 +273,7 @@ else if (recipe instanceof CookingRecipe<?>) {
                 return;
             }
             String[] shape = ((ShapedRecipe) recipe).getShape();
-            event.setReplacedObject(new ElementTag(shape[0].length() + "x" + shape.length));
+            event.setReplacedObject(new ElementTag(shape[0].length() + "x" + shape.length).getObjectAttribute(attribute.fulfill(1)));
             return;
         }
 
@@ -290,7 +290,7 @@ else if (recipe instanceof CookingRecipe<?>) {
             if (recipe == null) {
                 return;
             }
-            event.setReplacedObject(new ElementTag(Utilities.getRecipeType(recipe)));
+            event.setReplacedObject(new ElementTag(Utilities.getRecipeType(recipe)).getObjectAttribute(attribute.fulfill(1)));
             return;
         }
 
@@ -306,7 +306,7 @@ else if (recipe instanceof CookingRecipe<?>) {
             if (recipe == null) {
                 return;
             }
-            event.setReplacedObject(new ItemTag(recipe.getResult()));
+            event.setReplacedObject(new ItemTag(recipe.getResult()).getObjectAttribute(attribute.fulfill(1)));
             return;
         }