Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2024-11-27 04:25:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2021-04-07 11:24:30 -05:00
commit 8d19c97103
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId> <artifactId>UltimateStacker</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.1.4</version> <version>2.1.5</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateStacker-${project.version}</finalName> <finalName>UltimateStacker-${project.version}</finalName>
@ -124,7 +124,7 @@
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>Lootables</artifactId> <artifactId>Lootables</artifactId>
<version>1.0.8</version> <version>1.0.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.bgsoftware</groupId> <groupId>com.bgsoftware</groupId>

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

@ -97,7 +97,6 @@ public class EntityStack extends ColdEntityStack {
plugin.getEntityStackManager().removeStack(event.getEntity()); plugin.getEntityStackManager().removeStack(event.getEntity());
plugin.getDataManager().deleteHost(this); plugin.getDataManager().deleteHost(this);
Location killedLocation = killed.getLocation();
List<Drop> preStackedDrops = new ArrayList<>(); List<Drop> preStackedDrops = new ArrayList<>();
for (int i = 1; i < getAmount(); i++) { for (int i = 1; i < getAmount(); i++) {
if (i == 1) { if (i == 1) {
@ -114,9 +113,6 @@ public class EntityStack extends ColdEntityStack {
DropUtils.processStackedDrop(killed, preStackedDrops, event); DropUtils.processStackedDrop(killed, preStackedDrops, event);
if (droppedExp > 0)
killedLocation.getWorld().spawn(killedLocation, ExperienceOrb.class).setExperience(droppedExp * getAmount());
if (killed.getKiller() == null) return; if (killed.getKiller() == null) return;
plugin.addExp(killed.getKiller(), this); plugin.addExp(killed.getKiller(), this);
} }