Merge branch '1.19.2' into 1.20.1

iron431 · Mar 17, 2024 · 7e8092e · 7e8092e
2 parents b2b9c6e + afcb6ec
commit 7e8092e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/LATEST_CHANGES.MD b/LATEST_CHANGES.MD
@@ -1,4 +1,5 @@
 ### Additions
+- (1.20.1): Fully ported Tetra compatibility
 - Added Shockwave Spell
 - Added Pyromancer Tower Structure
   - Pyromancer now lives here instead of the Mangrove Hut structure
@@ -47,6 +48,7 @@
 - Fixed Arrow Volley entity not having an owner
 - Fixed Evoker Fort cages having a gap, which pillagers could shoot and kill captive villagers through
 - Fixed Apotheosis gem values
+- Fixed scrolls with a count of more than 1 not display their school texture
 
 ### API
 - Added interface for easier use of ExtendedArmorMaterials
diff --git a/src/main/java/io/redspace/ironsspellbooks/api/spells/ISpellContainer.java b/src/main/java/io/redspace/ironsspellbooks/api/spells/ISpellContainer.java
@@ -44,7 +44,7 @@ public interface ISpellContainer extends INBTSerializable<CompoundTag> {
     void save(ItemStack stack);
 
     static boolean isSpellContainer(ItemStack itemStack) {
-        if (itemStack != null && itemStack.getCount() == 1) {
+        if (itemStack != null && itemStack.getCount() >= 1) {
             var tag = itemStack.getTag();
             return tag != null && (tag.contains(SpellContainer.SPELL_SLOT_CONTAINER) || SpellContainer.isLegacyTagFormat(tag));
         }