-
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Disable Towny version checker. - New Config Option: flight_Disable_Timer - Default: 3 - Number of seconds after leaving an allowed-flight area before flight is removed, giving players a chance to re-enter their town. - Closes #22 - Also handles moving between two allied towns. - Closes #30 - Fix taking flight off of people in Spectator/Creative gamemodes. - Closes #31
- Loading branch information
Showing
5 changed files
with
71 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 36 additions & 5 deletions
41
src/main/java/com/gmail/llmdlio/townyflight/listeners/PlayerLeaveTownListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,59 @@ | ||
| package com.gmail.llmdlio.townyflight.listeners; | ||
|
|
||
| import org.bukkit.ChatColor; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.event.EventHandler; | ||
| import org.bukkit.event.EventPriority; | ||
| import org.bukkit.event.Listener; | ||
| import org.bukkit.scheduler.BukkitRunnable; | ||
|
|
||
| import com.gmail.llmdlio.townyflight.TownyFlight; | ||
| import com.palmergames.bukkit.towny.event.PlayerLeaveTownEvent; | ||
|
|
||
| public class PlayerLeaveTownListener implements Listener{ | ||
|
|
||
| public PlayerLeaveTownListener() { | ||
| private final TownyFlight plugin; | ||
|
|
||
| public PlayerLeaveTownListener(TownyFlight instance) { | ||
| plugin = instance; | ||
| } | ||
|
|
||
| /* | ||
| * Listener for a player who leaves town. | ||
| * If they are flying, flying is deactivated. | ||
| * Runs one tick after the PlayerLeaveTownEvent in order to get the proper location. | ||
| */ | ||
| @EventHandler(priority = EventPriority.LOWEST) | ||
| private void playerLeftTownEvent (PlayerLeaveTownEvent event) { | ||
| Player player = event.getPlayer(); | ||
| if (player.hasPermission("townyflight.bypass")) | ||
| if (!player.getAllowFlight() || player.hasPermission("townyflight.bypass")) | ||
| return; | ||
| if (player.getAllowFlight()) | ||
| TownyFlight.toggleFlight(player, false, true, ""); | ||
|
|
||
| new BukkitRunnable() { | ||
| @Override | ||
| public void run() { | ||
| executeLeaveTown(player); | ||
| } | ||
| }.runTask(plugin); | ||
| } | ||
|
|
||
| /* | ||
| * If player has left the town borders into an area they cannot fly in, remove their flight. | ||
| * Handles the flightDisableTimer if in use. | ||
| */ | ||
| private void executeLeaveTown(Player player) { | ||
| if (!TownyFlight.canFly(player, true)) { | ||
| if (TownyFlight.flightDisableTimer < 1) | ||
| TownyFlight.toggleFlight(player, false, true, ""); | ||
| else { | ||
| player.sendMessage(TownyFlight.pluginPrefix + ChatColor.RED + String.format(TownyFlight.returnToAllowedArea, TownyFlight.flightDisableTimer)); | ||
| new BukkitRunnable() { | ||
| @Override | ||
| public void run() { | ||
| if (!TownyFlight.canFly(player, true)) | ||
| TownyFlight.toggleFlight(player, false, true, ""); | ||
| } | ||
| }.runTaskLater(plugin, TownyFlight.flightDisableTimer * 20); | ||
| } | ||
| } | ||
| } | ||
| } |