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

Fixed issues with wolves.

Browse Source
This commit is contained in:
Lilac 2019-08-18 19:00:53 +01:00
parent 2a628fe95e
commit 8e80c97747
3 changed files with 8 additions and 3 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.9.1" version: "1.9.2"
build: build:
stage: build stage: build

3
src/main/java/com/songoda/ultimatestacker/listeners/TameListeners.java
View File

@ -37,8 +37,9 @@ public class TameListeners implements Listener {
LivingEntity newEntity = plugin.getEntityUtils().newEntity((LivingEntity) tameable); LivingEntity newEntity = plugin.getEntityUtils().newEntity((LivingEntity) tameable);
plugin.getEntityStackManager().addStack(new EntityStack(newEntity, stack.getAmount() - 1)); EntityStack second = plugin.getEntityStackManager().addStack(new EntityStack(newEntity, stack.getAmount() - 1));
stack.setAmount(1); stack.setAmount(1);
second.setAmount(stack.getAmount() - 1);
plugin.getEntityStackManager().removeStack(entity); plugin.getEntityStackManager().removeStack(entity);
entity.setVelocity(getRandomVector()); entity.setVelocity(getRandomVector());
} }

6
src/main/java/com/songoda/ultimatestacker/utils/EntityUtils.java
View File

@ -266,7 +266,11 @@ public class EntityUtils {
} }
case IS_TAMED: { case IS_TAMED: {
if (!(initalEntity instanceof Tameable)) break; if (!(initalEntity instanceof Tameable)) break;
entityList.removeIf(entity -> ((Tameable) entity).isTamed()); if (((Tameable) initalEntity).isTamed()) {
entityList.removeIf(entity -> !((Tameable) entity).isTamed());
} else {
entityList.removeIf(entity -> ((Tameable) entity).isTamed());
}
} }
case ANIMAL_OWNER: { case ANIMAL_OWNER: {
if (!(initalEntity instanceof Tameable)) break; if (!(initalEntity instanceof Tameable)) break;