|
1 | 1 | package systems.kscott.randomspawnplus.spawn; |
2 | 2 |
|
3 | | -import io.papermc.lib.PaperLib; |
4 | | -import org.bukkit.*; |
| 3 | +import org.bukkit.Bukkit; |
| 4 | +import org.bukkit.Location; |
| 5 | +import org.bukkit.Material; |
| 6 | +import org.bukkit.World; |
5 | 7 | import org.bukkit.block.Block; |
6 | 8 | import org.bukkit.configuration.file.FileConfiguration; |
7 | 9 | import systems.kscott.randomspawnplus.RandomSpawnPlus; |
|
14 | 16 | import java.util.ArrayList; |
15 | 17 | import java.util.List; |
16 | 18 | import java.util.Random; |
17 | | -import java.util.concurrent.CompletableFuture; |
18 | | -import java.util.concurrent.ExecutionException; |
19 | 19 |
|
20 | 20 | public class SpawnFinder { |
21 | 21 |
|
@@ -173,20 +173,18 @@ public boolean checkSpawn(Location location) { |
173 | 173 |
|
174 | 174 | Location locClone = location.clone(); |
175 | 175 |
|
176 | | - Chunk chunk; |
177 | | - |
178 | | - CompletableFuture<Chunk> chunkCompletableFuture = PaperLib.getChunkAtAsync(location); |
179 | | - |
180 | | - try { |
181 | | - chunk = chunkCompletableFuture.get(); |
182 | | - } catch (InterruptedException | ExecutionException e) { |
183 | | - e.printStackTrace(); |
| 176 | + if (locClone == null) { |
184 | 177 | return false; |
185 | 178 | } |
| 179 | + // 89apt89 start - Fix Paper method use |
| 180 | + if (!location.getChunk().isLoaded()) { |
| 181 | + location.getChunk().load(); |
| 182 | + } |
| 183 | + // 89apt89 end |
186 | 184 |
|
187 | | - Block block0 = chunk.getBlock(locClone.getBlockX() & 0xF, locClone.getBlockY() & 0xF, locClone.getBlockZ() & 0xF); |
188 | | - Block block1 = chunk.getBlock(locClone.getBlockX() & 0xF, locClone.getBlockY() + 1 & 0xF, locClone.getBlockZ() & 0xF); |
189 | | - Block block2 = chunk.getBlock(locClone.getBlockX() & 0xF, locClone.getBlockY() + 2 & 0xF, locClone.getBlockZ() & 0xF); |
| 185 | + Block block0 = locClone.getBlock(); |
| 186 | + Block block1 = locClone.add(0, 1, 0).getBlock(); |
| 187 | + Block block2 = locClone.add(0, 1, 0).getBlock(); |
190 | 188 |
|
191 | 189 | if (block0 == null || block1 == null || block2 == null) { |
192 | 190 | return false; |
|
0 commit comments