From fbe4a3b385178ae6f572052abc82f1a276ad6eb1 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Sun, 25 Sep 2022 01:54:09 -0400
Subject: [PATCH] Fix Paper method use
from dev branch of 89apt89
---
.github/workflows/maven.yml | 2 +-
.gitignore | 3 +--
pom.xml | 2 +-
.../randomspawnplus/listeners/RSPFirstJoinListener.java | 3 ++-
.../systems/kscott/randomspawnplus/spawn/SpawnFinder.java | 4 +++-
src/main/resources/config.yml | 1 +
src/main/resources/lang.yml | 2 +-
7 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0beb6f2..5dbb8ed 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,5 +20,5 @@ jobs:
- name: Upload RandomSpawnPlus5
uses: actions/upload-artifact@v3
with:
- name: RandomSpawnPlus5-maven
+ name: RandomSpawnPlus5
path: target/
diff --git a/.gitignore b/.gitignore
index 3c37caf..d94c82c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,8 +100,7 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk
-.gradle
-build/
+target/
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/pom.xml b/pom.xml
index 8c96dbc..b79984b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
systems.kscott
randomspawnplus
- 5.0.0
+ 5.0.1
jar
RandomSpawnPlus
diff --git a/src/main/java/systems/kscott/randomspawnplus/listeners/RSPFirstJoinListener.java b/src/main/java/systems/kscott/randomspawnplus/listeners/RSPFirstJoinListener.java
index f214562..56ed740 100644
--- a/src/main/java/systems/kscott/randomspawnplus/listeners/RSPFirstJoinListener.java
+++ b/src/main/java/systems/kscott/randomspawnplus/listeners/RSPFirstJoinListener.java
@@ -41,7 +41,7 @@ public void firstJoinHandler(PlayerJoinEvent event) {
} else {
try {
Location spawnLoc = SpawnFinder.getInstance().findSpawn(true);
- //by quiquelhappy - Prevent essentials home replace
+ // quiquelhappy start - Prevent essentials home replace
boolean prevent = false;
if (config.getBoolean("essentials-home-on-first-spawn")) {
User user = plugin.getEssentials().getUser(player);
@@ -66,6 +66,7 @@ public void run() {
} else {
plugin.getLogger().warning("The spawn finder prevented a teleport for " + player.getUniqueId() + ", since essentials sethome is enabled and the player already had a home (perhaps old player data?).");
}
+ // quiquelhappy end
} catch (FinderTimedOutException e) {
plugin.getLogger().warning("The spawn finder failed to find a valid spawn, and has not given " + player.getUniqueId() + " a random spawn. If you find this happening a lot, then raise the 'spawn-finder-tries-before-timeout' key in the config.");
return;
diff --git a/src/main/java/systems/kscott/randomspawnplus/spawn/SpawnFinder.java b/src/main/java/systems/kscott/randomspawnplus/spawn/SpawnFinder.java
index d328e5f..a4b83db 100644
--- a/src/main/java/systems/kscott/randomspawnplus/spawn/SpawnFinder.java
+++ b/src/main/java/systems/kscott/randomspawnplus/spawn/SpawnFinder.java
@@ -167,9 +167,11 @@ public boolean checkSpawn(Location location) {
if (locClone == null) {
return false;
}
- if (!location.isChunkLoaded()) {
+ // 89apt89 start - Fix Paper method use
+ if (!location.getChunk().isLoaded()) {
location.getChunk().load();
}
+ // 89apt89 end
Block block0 = locClone.getBlock();
Block block1 = locClone.add(0, 1, 0).getBlock();
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a99576d..a501fb5 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,5 +1,6 @@
#############################
# RandomSpawnPlus5 #
+# Version 5.0.1 #
# by @89apt89 & @Dreeam #
#############################
diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml
index 98ef4c7..7f8973d 100644
--- a/src/main/resources/lang.yml
+++ b/src/main/resources/lang.yml
@@ -1,6 +1,6 @@
#############################
# RandomSpawnPlus5 #
-# Version 5.0.0 #
+# Version 5.0.1 #
# by @89apt89 & @Dreeam #
#############################