mirror of
https://e.coding.net/circlecloud/Residence.git
synced 2025-11-24 21:46:16 +00:00
@@ -47,10 +47,12 @@ import com.bekvon.bukkit.residence.listeners.ResidenceBlockListener;
|
|||||||
import com.bekvon.bukkit.residence.listeners.ResidenceEntityListener;
|
import com.bekvon.bukkit.residence.listeners.ResidenceEntityListener;
|
||||||
import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener;
|
import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener;
|
||||||
import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener_1_8;
|
import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener_1_8;
|
||||||
|
import com.bekvon.bukkit.residence.manager.ConfigManager;
|
||||||
|
import com.bekvon.bukkit.residence.manager.EntityManager;
|
||||||
|
import com.bekvon.bukkit.residence.manager.FlagManager;
|
||||||
import com.bekvon.bukkit.residence.permissions.PermissionManager;
|
import com.bekvon.bukkit.residence.permissions.PermissionManager;
|
||||||
import com.bekvon.bukkit.residence.persistance.YMLSaveHelper;
|
import com.bekvon.bukkit.residence.persistance.YMLSaveHelper;
|
||||||
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
|
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
|
||||||
import com.bekvon.bukkit.residence.protection.EntityManager;
|
|
||||||
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
||||||
import com.bekvon.bukkit.residence.protection.LeaseManager;
|
import com.bekvon.bukkit.residence.protection.LeaseManager;
|
||||||
import com.bekvon.bukkit.residence.protection.PermissionListManager;
|
import com.bekvon.bukkit.residence.protection.PermissionListManager;
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ import org.bukkit.command.CommandException;
|
|||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import com.bekvon.bukkit.residence.ConfigManager;
|
|
||||||
import com.bekvon.bukkit.residence.Residence;
|
import com.bekvon.bukkit.residence.Residence;
|
||||||
import com.bekvon.bukkit.residence.economy.TransactionManager;
|
import com.bekvon.bukkit.residence.economy.TransactionManager;
|
||||||
import com.bekvon.bukkit.residence.economy.rent.RentManager;
|
import com.bekvon.bukkit.residence.economy.rent.RentManager;
|
||||||
|
import com.bekvon.bukkit.residence.manager.ConfigManager;
|
||||||
import com.bekvon.bukkit.residence.permissions.PermissionManager;
|
import com.bekvon.bukkit.residence.permissions.PermissionManager;
|
||||||
import com.bekvon.bukkit.residence.protection.ResidenceManager;
|
import com.bekvon.bukkit.residence.protection.ResidenceManager;
|
||||||
import com.bekvon.bukkit.residence.selection.SelectionManager;
|
import com.bekvon.bukkit.residence.selection.SelectionManager;
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import org.bukkit.command.CommandException;
|
|||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import com.bekvon.bukkit.residence.ConfigManager;
|
|
||||||
import com.bekvon.bukkit.residence.Residence;
|
import com.bekvon.bukkit.residence.Residence;
|
||||||
|
import com.bekvon.bukkit.residence.manager.ConfigManager;
|
||||||
import com.bekvon.bukkit.residence.text.Language;
|
import com.bekvon.bukkit.residence.text.Language;
|
||||||
|
|
||||||
import cn.citycraft.PluginHelper.commands.BaseCommand;
|
import cn.citycraft.PluginHelper.commands.BaseCommand;
|
||||||
@@ -27,7 +27,6 @@ public class CommandTool extends BaseCommand {
|
|||||||
public void execute(final CommandSender sender, final Command command, final String label, final String[] args) throws CommandException {
|
public void execute(final CommandSender sender, final Command command, final String label, final String[] args) throws CommandException {
|
||||||
final Player player = (Player) sender;
|
final Player player = (Player) sender;
|
||||||
final Language language = plugin.getLanguage();
|
final Language language = plugin.getLanguage();
|
||||||
|
|
||||||
final ConfigManager cmanager = plugin.getConfigManager();
|
final ConfigManager cmanager = plugin.getConfigManager();
|
||||||
player.sendMessage(ChatColor.YELLOW + language.getPhrase("SelectionTool") + ":" + ChatColor.GREEN + Material.getMaterial(cmanager.getSelectionTooldID()));
|
player.sendMessage(ChatColor.YELLOW + language.getPhrase("SelectionTool") + ":" + ChatColor.GREEN + Material.getMaterial(cmanager.getSelectionTooldID()));
|
||||||
player.sendMessage(ChatColor.YELLOW + language.getPhrase("InfoTool") + ": " + ChatColor.GREEN + Material.getMaterial(cmanager.getInfoToolID()));
|
player.sendMessage(ChatColor.YELLOW + language.getPhrase("InfoTool") + ": " + ChatColor.GREEN + Material.getMaterial(cmanager.getInfoToolID()));
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ import org.bukkit.event.hanging.HangingBreakEvent;
|
|||||||
import org.bukkit.event.hanging.HangingPlaceEvent;
|
import org.bukkit.event.hanging.HangingPlaceEvent;
|
||||||
|
|
||||||
import com.bekvon.bukkit.residence.Residence;
|
import com.bekvon.bukkit.residence.Residence;
|
||||||
|
import com.bekvon.bukkit.residence.manager.EntityManager;
|
||||||
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
|
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
|
||||||
import com.bekvon.bukkit.residence.protection.EntityManager;
|
|
||||||
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import org.bukkit.event.Listener;
|
|||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
|
|
||||||
import com.bekvon.bukkit.residence.Residence;
|
import com.bekvon.bukkit.residence.Residence;
|
||||||
|
import com.bekvon.bukkit.residence.manager.EntityManager;
|
||||||
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
|
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
|
||||||
import com.bekvon.bukkit.residence.protection.EntityManager;
|
|
||||||
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
||||||
|
|
||||||
public class ResidenceAnimalKilling implements Listener {
|
public class ResidenceAnimalKilling implements Listener {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* To change this template, choose Tools | Templates and open the template in the editor.
|
* To change this template, choose Tools | Templates and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package com.bekvon.bukkit.residence;
|
package com.bekvon.bukkit.residence.manager;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -13,6 +13,7 @@ import org.bukkit.Material;
|
|||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
|
||||||
|
import com.bekvon.bukkit.residence.Residence;
|
||||||
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
import com.bekvon.bukkit.residence.protection.FlagPermissions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.bekvon.bukkit.residence.protection;
|
package com.bekvon.bukkit.residence.manager;
|
||||||
|
|
||||||
import org.bukkit.entity.Bat;
|
import org.bukkit.entity.Bat;
|
||||||
import org.bukkit.entity.Chicken;
|
import org.bukkit.entity.Chicken;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.bekvon.bukkit.residence;
|
package com.bekvon.bukkit.residence.manager;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
@@ -6,6 +6,7 @@ import java.util.Map.Entry;
|
|||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.plugin.PluginManager;
|
import org.bukkit.plugin.PluginManager;
|
||||||
|
|
||||||
|
import com.bekvon.bukkit.residence.Residence;
|
||||||
import com.bekvon.bukkit.residence.listeners.flag.ResidenceAnimalKilling;
|
import com.bekvon.bukkit.residence.listeners.flag.ResidenceAnimalKilling;
|
||||||
import com.bekvon.bukkit.residence.listeners.flag.ResidenceFlyListener;
|
import com.bekvon.bukkit.residence.listeners.flag.ResidenceFlyListener;
|
||||||
|
|
||||||
@@ -27,8 +28,8 @@ public class FlagManager {
|
|||||||
|
|
||||||
flagmap = new HashMap<Boolean, Listener>();
|
flagmap = new HashMap<Boolean, Listener>();
|
||||||
|
|
||||||
flagmap.put(config.getBoolean("Flag.Fly"), new ResidenceFlyListener(plugin));
|
flagmap.put(config.getBoolean("Flag.Fly", true), new ResidenceFlyListener(plugin));
|
||||||
flagmap.put(config.getBoolean("Flag.AnimalKilling"), new ResidenceAnimalKilling(plugin));
|
flagmap.put(config.getBoolean("Flag.AnimalKilling", true), new ResidenceAnimalKilling(plugin));
|
||||||
|
|
||||||
for (final Entry<Boolean, Listener> fm : flagmap.entrySet()) {
|
for (final Entry<Boolean, Listener> fm : flagmap.entrySet()) {
|
||||||
if (fm.getKey()) {
|
if (fm.getKey()) {
|
||||||
Reference in New Issue
Block a user