From 0479cb44eda44fc095d98bd9141394e15f4c30b8 Mon Sep 17 00:00:00 2001 From: Florens Pauwels Date: Wed, 22 Jun 2022 23:30:45 +0200 Subject: [PATCH] Fix trinket EAM implementation (#65) --- CHANGELOG.md | 4 ++++ src/main/java/artifacts/common/item/curio/CurioItem.java | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b099103..5f2db7b5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] +### Fixed +- Fix Trinket entity attributes implementation (#65) + ## [7.1.1] - 2022-06-22 ### Fixed - Fix deprecation warning when playing with Roughly Enough Items diff --git a/src/main/java/artifacts/common/item/curio/CurioItem.java b/src/main/java/artifacts/common/item/curio/CurioItem.java index b529d9664..b4dbda472 100644 --- a/src/main/java/artifacts/common/item/curio/CurioItem.java +++ b/src/main/java/artifacts/common/item/curio/CurioItem.java @@ -88,10 +88,13 @@ protected void curioTick(LivingEntity livingEntity, ItemStack stack) { @Override public final Multimap getModifiers(ItemStack stack, SlotReference slot, LivingEntity entity, UUID uuid) { + Multimap modifiers = Trinket.super.getModifiers(stack, slot, entity, uuid); if (TrinketsHelper.areEffectsEnabled(stack)) { - return this.applyModifiers(stack, slot, entity, uuid); + Multimap artifactModifiers = this.applyModifiers(stack, slot, entity, uuid); + modifiers.putAll(artifactModifiers); } - return HashMultimap.create(); + + return modifiers; } protected Multimap applyModifiers(ItemStack stack, SlotReference slot, LivingEntity entity, UUID uuid) {