Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-03 06:37:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'elemental-damage-stacking-error-fix' into 'master'

Browse Source 
Fixes Stacking of Elements' Double Values - Noticed during fix of Elements tag testing!

See merge request phoenix-dvpmt/mmoitems!30
This commit is contained in:
Jules 2022-11-03 16:53:07 +00:00
commit d1ed762288
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/data/ElementListData.java
View File

@ -33,7 +33,8 @@ public class ElementListData implements Mergeable {
public void merge(StatData data) {
Validate.isTrue(data instanceof ElementListData, "Cannot merge two different stat data types");
ElementListData extra = (ElementListData) data;
extra.stats.forEach((key, value) -> stats.put(key, value));
//Includes old values if any, fixes stacking of element double values I believe - Kilo
extra.stats.forEach((key, value) -> stats.put(key, value + stats.getOrDefault(key,0.0)));
}
@NotNull