Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-01-03 22:37:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-12-01 15:37:00 -06:00
commit 7b7daf37d5
3 changed files with 6 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> <groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId> <artifactId>UltimateStacker</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.1</version> <version>2.1.1</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateStacker-${project.version}</finalName> <finalName>UltimateStacker-${project.version}</finalName>

4
src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
View File

@ -228,6 +228,10 @@ public class UltimateStacker extends SongodaPlugin {
@Override @Override
public void onDataLoad() { public void onDataLoad() {
if (HologramManager.isEnabled())
// Set the offset so that the holograms don't end up inside the blocks.
HologramManager.getHolograms().setPositionOffset(.5,.65,.5);
// Load current data. // Load current data.
final boolean useSpawnerHolo = Settings.SPAWNER_HOLOGRAMS.getBoolean(); final boolean useSpawnerHolo = Settings.SPAWNER_HOLOGRAMS.getBoolean();
this.dataManager.getSpawners((spawners) -> { this.dataManager.getSpawners((spawners) -> {

1
src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
View File

@ -57,6 +57,7 @@ public class BlockListeners implements Listener {
boolean isStacked = blockStackManager.isBlock(block.getLocation()); boolean isStacked = blockStackManager.isBlock(block.getLocation());
CompatibleMaterial blockType = CompatibleMaterial.getMaterial(block); CompatibleMaterial blockType = CompatibleMaterial.getMaterial(block);
if (blockType == null) return;
if (isStacked || Settings.STACKABLE_BLOCKS.getStringList().contains(blockType.name())) { if (isStacked || Settings.STACKABLE_BLOCKS.getStringList().contains(blockType.name())) {
BlockStack stack = blockStackManager.getBlock(block, blockType); BlockStack stack = blockStackManager.getBlock(block, blockType);