Upstream/RandomTeleport
1
0
Fork 0
mirror of https://github.com/Phoenix616/RandomTeleport.git synced 2025-02-16 20:41:21 +01:00
Code Issues Projects Releases Wiki Activity

Remove static access of plugin from listener

Browse Source
This commit is contained in:
Max Lee 2015-06-30 17:39:36 +02:00
parent 4c60c96de5
commit 8999f30d2f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/Listeners/SignListener.java
View File

@ -16,6 +16,12 @@ import org.bukkit.event.player.PlayerInteractEvent;
*/
public class SignListener implements Listener {
private final RandomTeleport plugin;
public SignListener(RandomTeleport plugin) {
this.plugin = plugin;
}
@EventHandler
public void onSignCreate(SignChangeEvent event) {
if(event.getLine(1).equalsIgnoreCase("[rtp]") || event.getLine(1).equalsIgnoreCase("[RandomTP]")){
@ -24,7 +30,7 @@ public class SignListener implements Listener {
event.getPlayer().sendMessage(ChatColor.RED + "You don't have permission to create RandomTeleport preset signs! " + ChatColor.ITALIC + " (randomteleport.sign.create)");
} else {
event.getPlayer().sendMessage(ChatColor.GREEN + "RandomTeleport preset sign created!");
if (RandomTeleport.getInstance().getConfig().getString("presets." + event.getLine(2).toLowerCase()) == null) {
if(plugin.getConfig().getString("presets." + event.getLine(2).toLowerCase()) == null) {
event.getPlayer().sendMessage(ChatColor.DARK_RED + "Warning: " + ChatColor.RED + "The RandomTeleport preset " + ChatColor.GOLD + event.getLine(2).toLowerCase() + ChatColor.RED + " does not exist!");
}
}
@ -36,7 +42,7 @@ public class SignListener implements Listener {
if(event.getBlock().getType() == Material.WALL_SIGN || event.getBlock().getType() == Material.SIGN_POST) {
Sign sign = (Sign) event.getBlock().getState();
if(sign.getLine(1).equalsIgnoreCase("[rtp]") || sign.getLine(1).equalsIgnoreCase("[RandomTP]")){
if (!event.getPlayer().hasPermission("randomteleport.sign.create")){
if(!event.getPlayer().hasPermission("randomteleport.sign.create")){
event.setCancelled(true);
event.getPlayer().sendMessage(ChatColor.RED + "You don't have permission to break RandomTeleport signs! " + ChatColor.ITALIC + " (randomteleport.sign.create)");
} else {
@ -52,12 +58,12 @@ public class SignListener implements Listener {
Sign sign = (Sign) event.getClickedBlock().getState();
if(sign.getLine(1).equalsIgnoreCase("[rtp]") || sign.getLine(1).equalsIgnoreCase("[RandomTP]")) {
String preset = sign.getLine(2).toLowerCase();
if (event.getPlayer().hasPermission("randomteleport.sign.preset." + preset)) {
if (RandomTeleport.getInstance().getConfig().getString("presets." + preset) == null) {
if(event.getPlayer().hasPermission("randomteleport.sign.preset." + preset)) {
if(plugin.getConfig().getString("presets." + preset) == null) {
event.getPlayer().sendMessage(ChatColor.RED + "The RandomTeleport preset " + ChatColor.GOLD + preset + ChatColor.RED + " does not exist!");
} else {
String cmd = "rtp " + preset + " " + event.getPlayer().getName();
RandomTeleport.getInstance().getServer().dispatchCommand(RandomTeleport.getInstance().getServer().getConsoleSender(), cmd);
plugin.getServer().dispatchCommand(RandomTeleport.getInstance().getServer().getConsoleSender(), cmd);
}
} else {
event.getPlayer().sendMessage(ChatColor.RED + "You don't have permission to use the preset " + preset + "! " + ChatColor.ITALIC + " (randomteleport.sign.preset." + preset + ")");

2
RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/RandomTeleport.java
View File

@ -54,7 +54,7 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
getLogger().log(Level.INFO, "Attempting to load cooldown.map...");
cooldown = (HashMap<String, Long>) readMap("cooldown.map");
getServer().getPluginManager().registerEvents(new SignListener(), this);
getServer().getPluginManager().registerEvents(new SignListener(this), this);
if(Bukkit.getPluginManager().getPlugin("WorldGuard") != null){
getLogger().log(Level.INFO, "Detected WorldGuard.");