Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2024-12-24 17:37:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-10-08 14:47:44 -04:00
commit 0b30f7c6a9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "UltimateStacker" name: "UltimateStacker"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "1.10.14" version: "1.10.15"
build: build:
stage: build stage: build

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

@ -126,7 +126,8 @@ public class EntityStack {
if (!preStackedDrops.isEmpty()) if (!preStackedDrops.isEmpty())
DropUtils.processStackedDrop(killed, preStackedDrops); DropUtils.processStackedDrop(killed, preStackedDrops);
killedLocation.getWorld().spawn(killedLocation, ExperienceOrb.class).setExperience(droppedExp * amount); if (droppedExp > 0)
killedLocation.getWorld().spawn(killedLocation, ExperienceOrb.class).setExperience(droppedExp * amount);
if (killed.getKiller() == null) return; if (killed.getKiller() == null) return;
UltimateStacker.getInstance().addExp(killed.getKiller(), this); UltimateStacker.getInstance().addExp(killed.getKiller(), this);
@ -200,13 +201,13 @@ public class EntityStack {
} }
public void addHealth(double health) { public void addHealth(double health) {
synchronized(healthLock) { synchronized (healthLock) {
this.health.addLast(health); this.health.addLast(health);
} }
} }
public void mergeHealth(EntityStack stack) { public void mergeHealth(EntityStack stack) {
synchronized(healthLock) { synchronized (healthLock) {
this.health.addAll(stack.health); this.health.addAll(stack.health);
} }
} }

4
src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java
View File

@ -7,6 +7,7 @@ import com.songoda.lootables.Modify;
import com.songoda.lootables.loot.*; import com.songoda.lootables.loot.*;
import com.songoda.ultimatestacker.UltimateStacker; import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings; import com.songoda.ultimatestacker.settings.Settings;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.*; import org.bukkit.entity.*;
@ -77,9 +78,8 @@ public class LootablesManager {
} }
} }
} }
return lootManager.runLoot(modify, return lootManager.runLoot(modify,
entity.getFireTicks() != -1, entity.getFireTicks() > 0,
entity.getKiller() != null ? entity.getKiller().getItemInHand() : null, entity.getKiller() != null ? entity.getKiller().getItemInHand() : null,
killer, killer,
loot, loot,