Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-27 14:13:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2022-09-05 23:02:53 +02:00
commit baff0b3497
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId>
<version>2.4.2</version>
<version>2.5.0</version>
<packaging>jar</packaging>
<properties>
@ -200,7 +200,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>2.6.14-DEV</version>
<version>2.6.16</version>
<scope>compile</scope>
</dependency>

3
src/main/java/com/songoda/skyblock/SkyBlock.java
View File

@ -7,6 +7,7 @@ import com.songoda.core.compatibility.ServerProject;
import com.songoda.core.compatibility.ServerVersion;
import com.songoda.core.configuration.Config;
import com.songoda.core.gui.GuiManager;
import com.songoda.core.hooks.HologramManager;
import com.songoda.core.hooks.LogManager;
import com.songoda.skyblock.api.SkyBlockAPI;
import com.songoda.skyblock.ban.BanManager;
@ -155,7 +156,7 @@ public class SkyBlock extends SongodaPlugin {
economyManager = new EconomyManager(this);
// Load Holograms
com.songoda.core.hooks.HologramManager.load(this);
HologramManager.load(this);
fileManager = new FileManager(this);

6
src/main/java/com/songoda/skyblock/blockscanner/ChunkLoader.java
View File

@ -114,14 +114,14 @@ public class ChunkLoader extends BukkitRunnable {
@Override
public void run() { // TODO New algorithm that start from the center of the island
for (int i = 0; i < chunkPerTick || paper; ++i) {
for (int i = 0; i < chunkPerTick || paper; i++) {
if (x <= maxX) {
if (z <= maxZ) {
if (!chunkForChunk) {
positions.add(new CachedChunk(world, x, z));
positions.add(new CachedChunk(world, x >> 4, z >> 4));
} else {
if (chunkTask != null) {
chunkTask.onChunkComplete(new CachedChunk(world, x, z));
chunkTask.onChunkComplete(new CachedChunk(world, x >> 4, z >> 4));
}
}