SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure disguise isn't running in an unloaded world

Browse Source
This commit is contained in:
libraryaddict 2021-05-27 13:08:44 +12:00
parent 08deb7ee30
commit 3370a1353d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -682,8 +682,9 @@ public abstract class Disguise {
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
// If this disguise is not in use, and the entity isnt a player that's offline // Can only continue a disguise that's valid
if (event.isCancelled() && (!(getEntity() instanceof Player) || ((Player) getEntity()).isOnline())) { if (event.isCancelled() && getEntity() != null && Bukkit.getWorlds().contains(getEntity().getWorld()) &&
(!(getEntity() instanceof Player) || ((Player) getEntity()).isOnline())) {
return false; return false;
} }

10
src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseRunnable.java
View File

@ -10,6 +10,7 @@ import me.libraryaddict.disguise.disguisetypes.watchers.BatWatcher;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -64,8 +65,13 @@ class DisguiseRunnable extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
if (!disguise.isDisguiseInUse() || disguise.getEntity() == null) { if (!disguise.isDisguiseInUse() || disguise.getEntity() == null || !Bukkit.getWorlds().contains(disguise.getEntity().getWorld())) {
cancel(); disguise.stopDisguise();
// If still somehow not cancelled
if (!isCancelled()) {
cancel();
}
return; return;
} }