Skip to content

Commit

Permalink
Fix issues with envoy initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
NahuLD committed Jun 28, 2024
1 parent cc661f7 commit cf56b62
Showing 1 changed file with 32 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -726,44 +726,49 @@ public boolean startEnvoyEvent() {

for (Block block : dropLocations) {
if (block != null) {
boolean spawnFallingBlock = false;

if (this.config.getProperty(ConfigKeys.envoy_falling_block_toggle)) {
for (Entity entity : this.methods.getNearbyEntities(block.getLocation(), 40, 40, 40)) {
if (entity instanceof Player) {
spawnFallingBlock = true;
break;
this.runTimeTask = new FoliaRunnable(this.plugin.getServer().getRegionScheduler(), block.getLocation()) {
@Override
public void run() {
boolean spawnFallingBlock = false;

if (config.getProperty(ConfigKeys.envoy_falling_block_toggle)) {
for (Entity entity : methods.getNearbyEntities(block.getLocation(), 40, 40, 40)) {
if (entity instanceof Player) {
spawnFallingBlock = true;
break;
}
}
}
}
}

if (spawnFallingBlock) {
if (!block.getChunk().isLoaded()) block.getChunk().load();
if (spawnFallingBlock) {
if (!block.getChunk().isLoaded()) block.getChunk().load();

int fallingHeight = this.config.getProperty(ConfigKeys.envoy_falling_height);
Material material = Material.valueOf(this.config.getProperty(ConfigKeys.envoy_falling_block_type));
int fallingHeight = config.getProperty(ConfigKeys.envoy_falling_height);
Material material = Material.valueOf(config.getProperty(ConfigKeys.envoy_falling_block_type));

FallingBlock fallingBlock = block.getWorld().spawn(block.getLocation().add(.5, fallingHeight, .5), FallingBlock.class);
fallingBlock.setBlockData(material.createBlockData());
FallingBlock fallingBlock = block.getWorld().spawn(block.getLocation().add(.5, fallingHeight, .5), FallingBlock.class);
fallingBlock.setBlockData(material.createBlockData());

fallingBlock.setDropItem(false);
fallingBlock.setHurtEntities(false);
fallingBlock.setDropItem(false);
fallingBlock.setHurtEntities(false);

this.fallingBlocks.put(fallingBlock, block);
} else {
Tier tier = pickRandomTier();
fallingBlocks.put(fallingBlock, block);
} else {
Tier tier = pickRandomTier();

if (!block.getChunk().isLoaded()) block.getChunk().load();
if (!block.getChunk().isLoaded()) block.getChunk().load();

block.setType(tier.getPlacedBlockMaterial());
block.setType(tier.getPlacedBlockMaterial());

if (tier.isHoloEnabled() && hasHologramPlugin()) this.hologramController.createHologram(block, tier);
if (tier.isHoloEnabled() && hasHologramPlugin()) hologramController.createHologram(block, tier);

addActiveEnvoy(block, tier);
this.locationSettings.addActiveLocation(block);
addActiveEnvoy(block, tier);
locationSettings.addActiveLocation(block);

if (tier.getSignalFlareToggle() && block.getChunk().isLoaded()) startSignalFlare(block.getLocation(), tier);
}
if (tier.getSignalFlareToggle() && block.getChunk().isLoaded()) startSignalFlare(block.getLocation(), tier);
}
}
}.run(this.plugin);
}
}

Expand Down

0 comments on commit cf56b62

Please sign in to comment.