mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2026-04-08 08:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

party accept/readyup + api RTP_EventSettingUp fix

Browse Source
This commit is contained in:
RonanCraft
2022-03-03 16:57:21 -05:00
parent 22eff44288
commit 1ef7fe8959
12 changed files with 151 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
View File

@@ -1,6 +1,7 @@
package me.SuperRonanCraft.BetterRTP.player.rtp;
import lombok.Getter;
import me.RonanCraft.Pueblos.resources.tools.HelperEvent;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_SettingUpEvent;
import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
@@ -112,8 +113,9 @@ public class RTP {
}
public void start(RTPSetupInformation setup_info) {
if (new RTP_SettingUpEvent(setup_info.player).isCancelled()) {
RTP_SettingUpEvent setup = new RTP_SettingUpEvent(setup_info.player);
Bukkit.getPluginManager().callEvent(setup);
if (setup.isCancelled()) {
return;
}

2
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
View File

@@ -4,6 +4,7 @@ import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_FindLocationEven
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer;
import io.papermc.lib.PaperLib;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
@@ -41,6 +42,7 @@ public class RTPPlayer {
else { //Try again to find a safe location
//Find a queue'd location
RTP_FindLocationEvent event = new RTP_FindLocationEvent(p, pWorld); //Find a queue'd location
Bukkit.getServer().getPluginManager().callEvent(event);
Location loc;
if (event.getLocation() != null && pWorld.checkIsValid(event.getLocation()))
loc = event.getLocation();