Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-02 08:50:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added plot entry event for unowned plots

Browse Source
This commit is contained in:
boy0001 2015-07-21 14:30:41 +10:00
parent 9fefdf3313
commit 0c81dd82b3
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
View File

@ -110,10 +110,9 @@ public class PlotListener extends APlotListener {
} }
pp.setMeta("lastplot", plot); pp.setMeta("lastplot", plot);
final Player player = ((BukkitPlayer) pp).player; final Player player = ((BukkitPlayer) pp).player;
final PlayerEnterPlotEvent callEvent = new PlayerEnterPlotEvent(player, plot);
Bukkit.getPluginManager().callEvent(callEvent);
if (plot.hasOwner()) { if (plot.hasOwner()) {
final PlayerEnterPlotEvent callEvent = new PlayerEnterPlotEvent(player, plot);
Bukkit.getPluginManager().callEvent(callEvent);
HashMap<String, Flag> flags = FlagManager.getPlotFlags(plot); HashMap<String, Flag> flags = FlagManager.getPlotFlags(plot);
int size = flags.size(); int size = flags.size();
boolean titles = Settings.TITLES; boolean titles = Settings.TITLES;
@ -229,29 +228,31 @@ public class PlotListener extends APlotListener {
Player player = ((BukkitPlayer) pp).player; Player player = ((BukkitPlayer) pp).player;
final PlayerLeavePlotEvent callEvent = new PlayerLeavePlotEvent(player, plot); final PlayerLeavePlotEvent callEvent = new PlayerLeavePlotEvent(player, plot);
Bukkit.getPluginManager().callEvent(callEvent); Bukkit.getPluginManager().callEvent(callEvent);
if (FlagManager.getPlotFlag(plot, "fly") != null) { if (plot.hasOwner()) {
player.setAllowFlight(Bukkit.getAllowFlight()); if (FlagManager.getPlotFlag(plot, "fly") != null) {
} player.setAllowFlight(Bukkit.getAllowFlight());
if (FlagManager.getPlotFlag(plot, "gamemode") != null) { }
if (player.getGameMode() != Bukkit.getDefaultGameMode()) { if (FlagManager.getPlotFlag(plot, "gamemode") != null) {
if (!player.hasPermission("plots.gamemode.bypass")) { if (player.getGameMode() != Bukkit.getDefaultGameMode()) {
player.setGameMode(Bukkit.getDefaultGameMode()); if (!player.hasPermission("plots.gamemode.bypass")) {
} player.setGameMode(Bukkit.getDefaultGameMode());
else { }
MainUtil.sendMessage(pp, StringMan.replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.world, "{gamemode}", Bukkit.getDefaultGameMode().name().toLowerCase())); else {
MainUtil.sendMessage(pp, StringMan.replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.world, "{gamemode}", Bukkit.getDefaultGameMode().name().toLowerCase()));
}
} }
} }
} if (FlagManager.getPlotFlag(plot, "time") != null) {
if (FlagManager.getPlotFlag(plot, "time") != null) { player.resetPlayerTime();
player.resetPlayerTime(); }
} if (FlagManager.getPlotFlag(plot, "weather") != null) {
if (FlagManager.getPlotFlag(plot, "weather") != null) { player.resetPlayerWeather();
player.resetPlayerWeather(); }
} org.bukkit.Location lastLoc = (org.bukkit.Location) pp.getMeta("music");
org.bukkit.Location lastLoc = (org.bukkit.Location) pp.getMeta("music"); if (lastLoc != null) {
if (lastLoc != null) { pp.deleteMeta("music");
pp.deleteMeta("music"); player.playEffect(lastLoc, Effect.RECORD_PLAY, 0);
player.playEffect(lastLoc, Effect.RECORD_PLAY, 0); }
} }
return true; return true;
} }