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

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-10-05 12:01:04 -04:00
commit 037ff4400f
3 changed files with 7 additions and 4 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:
name: "UltimateStacker"
path: "/builds/$CI_PROJECT_PATH"
version: "1.10.12"
version: "1.10.13"
build:
stage: build

3
src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java
View File

@ -149,7 +149,8 @@ public class StackingTask extends BukkitRunnable {
if (this.processed.contains(entity.getUniqueId())) continue;
// Check our WorldGuard flag.
if (WorldGuardHook.isEnabled() && !WorldGuardHook.getBooleanFlag(entity.getLocation(), "mob-stacking"))
Boolean flag = WorldGuardHook.isEnabled() ? WorldGuardHook.getBooleanFlag(livingEntity.getLocation(), "mob-stacking") : null;
if (flag != null && !flag)
continue;
// Get this entities friendStack.

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

@ -125,7 +125,8 @@ public class EntityUtils {
break;
}
case SNOWMAN_DERPED: {
if (!(toClone instanceof Snowman)) break;
if (!ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)
|| !(toClone instanceof Snowman)) break;
((Snowman) newEntity).setDerp(((Snowman) toClone).isDerp());
break;
}
@ -315,7 +316,8 @@ public class EntityUtils {
break;
}
case SNOWMAN_DERPED: {
if (!(initalEntity instanceof Snowman)) break;
if (!ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)
|| !(initalEntity instanceof Snowman)) break;
Snowman snowman = ((Snowman) initalEntity);
if (snowman.isDerp()) {