Skip to content

Commit 5ec3698

Browse files
committed
Fix exception using /spawn while spawn is not set.
1 parent 06927ef commit 5ec3698

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnServiceImpl.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ public SpawnServiceImpl(LocationsConfiguration locationsConfiguration, Configura
2929

3030
@Override
3131
public void teleportToSpawn(Player player) {
32-
Position spawn = this.locationsConfiguration.spawn;
33-
34-
if (spawn.isNoneWorld()) {
32+
if (!isSpawnValid()) {
3533
this.logger.warning(WARNING);
36-
3734
return;
3835
}
3936

40-
PaperLib.teleportAsync(player, PositionAdapter.convert(spawn));
37+
Location spawnLocation = PositionAdapter.convert(this.locationsConfiguration.spawn);
38+
PaperLib.teleportAsync(player, spawnLocation);
4139
}
4240

4341
@Override
@@ -48,7 +46,15 @@ public void setSpawnLocation(Location location) {
4846

4947
@Override
5048
public Location getSpawnLocation() {
51-
Position spawn = this.locationsConfiguration.spawn;
52-
return PositionAdapter.convert(spawn);
49+
if (!isSpawnValid()) {
50+
this.logger.warning(WARNING);
51+
return null;
52+
}
53+
54+
return PositionAdapter.convert(this.locationsConfiguration.spawn);
55+
}
56+
57+
private boolean isSpawnValid() {
58+
return !this.locationsConfiguration.spawn.isNoneWorld();
5359
}
5460
}

0 commit comments

Comments
 (0)