Upstream
/
UltimateStacker
mirror of https://github.com/songoda/UltimateStacker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Brianna 2020-04-15 10:57:19 -04:00
parent 21f9bcadef 67d8e9479f
commit 48367f5de6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>1.11.10</version>
<version>1.11.11</version>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>UltimateStacker-${project.version}</finalName>

4
src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java
View File

@ -2,6 +2,7 @@ package com.songoda.ultimatestacker.entity;
import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.compatibility.ServerVersion;
import com.songoda.core.utils.EntityUtils;
import com.songoda.lootables.loot.Drop;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings;
@ -157,6 +158,9 @@ public class EntityStack {
newEntity.setMetadata(entry.getKey(), entry.getValue());
}
if (!EntityUtils.isAware(killed))
EntityUtils.setUnaware(newEntity);
DropUtils.processStackedDrop(killed, drops, event);
EntityStack entityStack = stackManager.updateStack(killed, newEntity);