Skip to content

Fix vanish-granted flight persisting after reappear, quit and relog #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MiddleXen wants to merge 3 commits into
base: master
Choose a base branch
from
+21 −11
Open

Fix vanish-granted flight persisting after reappear, quit and relog #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38559a1
Extract resetVanishFlight() and disable flying on reappear
MiddleXen Jun 21, 2026
62134fa
Reset vanish flight on join for non-vanished players
MiddleXen Jun 21, 2026
d2ffa6e
Reset vanish flight on auto-reappear quit
MiddleXen Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/de/myzelyam/supervanish/listeners/JoinListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ public void execute(Listener l, Event event) {
// not vanished:
// metadata
p.removeMetadata("vanished", plugin);
// clear vanish-granted flight that may persist in player data after relog
plugin.getVisibilityChanger().resetVanishFlight(p);
}
// not necessarily vanished:
// recreate files msg
Expand All @@ -94,4 +96,4 @@ public void run() {
plugin.logException(er);
}
}
}
}
3 changes: 2 additions & 1 deletion src/main/java/de/myzelyam/supervanish/listeners/QuitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void execute(Listener l, Event event) {
|| plugin.getSettings().getBoolean("VanishStateFeatures.CheckPermissionOnQuit")
&& !CommandAction.VANISH_SELF.checkPermission(p, plugin)) {
plugin.getVanishStateMgr().setVanishedState(p.getUniqueId(), p.getName(), false, null);
plugin.getVisibilityChanger().resetVanishFlight(p);
// check if it should handle the quit msg
if (!config.getBoolean("MessageOptions.ReappearOnQuitHideLeaveMsg"))
noMsg = true;
Expand All @@ -64,4 +65,4 @@ public void execute(Listener l, Event event) {
plugin.logException(er);
}
}
}
}
25 changes: 16 additions & 9 deletions src/main/java/de/myzelyam/supervanish/visibility/VisibilityChanger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,7 @@ public void showPlayer(final Player player, final String showerName, boolean sil
else
plugin.sendMessage(player, "OnReappearCausedByOtherPlayer", player, showerName);
// fly
// remove fly if not spectator or creative and no perm
if (config.getBoolean("InvisibilityFeatures.Fly.DisableOnReappear")
&& !player.hasPermission("sv.keepfly")
&& (player.getGameMode() == GameMode.SURVIVAL
|| player.getGameMode() == GameMode.ADVENTURE)
&& config.getBoolean("InvisibilityFeatures.Fly.Enable")) {
player.setAllowFlight(false);
}
resetVanishFlight(player);
// call post event
PostPlayerShowEvent e2 = new PostPlayerShowEvent(player, silent);
plugin.getServer().getPluginManager().callEvent(e2);
Expand All @@ -156,7 +149,21 @@ public void showPlayer(final Player player, final String showerName, boolean sil
}
}

/**
* Removes vanish-granted flight from a player who is no longer invisible.
*/
public void resetVanishFlight(Player player) {
if (config.getBoolean("InvisibilityFeatures.Fly.DisableOnReappear")
&& !player.hasPermission("sv.keepfly")
&& (player.getGameMode() == GameMode.SURVIVAL
|| player.getGameMode() == GameMode.ADVENTURE)
&& config.getBoolean("InvisibilityFeatures.Fly.Enable")) {
player.setAllowFlight(false);
player.setFlying(false);
}
}

public PlayerHider getHider() {
return hider;
}
}
}