502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00
Code Releases Activity

clean up and release version...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-09-24 19:30:11 +08:00
parent d62a7a1e57
commit 89b9e48ca8
14 changed files with 90 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/bekvon/bukkit/residence/Residence.java
View File

@@ -18,11 +18,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -103,23 +101,18 @@ public class Residence extends JavaPlugin {
protected boolean init;
protected Language language;
protected LeaseManager leasemanager;
protected Logger log;
protected ResidencePlayerListener plistener;
protected ResidencePlayerListener_1_8 plistener1_8;
protected PermissionListManager pmanager;
protected RentManager rentmanager;
protected List<String> resadminToggle;
protected ResidenceManager rmanager;
protected Server server;
protected SelectionManager smanager;
protected TaskManager taskmanager;
protected TransactionManager tmanager;
protected boolean useWorldEdit;
protected WorldFlagManager wmanager;
public Residence() {
}
public ResidenceBlockListener getBlockListener() {
return blistener;
}
@@ -172,10 +165,6 @@ public class Residence extends JavaPlugin {
return leasemanager;
}
public Logger getLog() {
return log;
}
public PermissionListManager getPermissionListManager() {
return pmanager;
}
@@ -220,10 +209,6 @@ public class Residence extends JavaPlugin {
return smanager;
}
public Server getServ() {
return server;
}
public TransactionManager getTransactionManager() {
return tmanager;
}
@@ -280,7 +265,7 @@ public class Residence extends JavaPlugin {
File loadFile;
final long time = System.currentTimeMillis();
final HashMap<String, Object> worlds = new HashMap<String, Object>();
for (final World world : server.getWorlds()) {
for (final World world : this.getServer().getWorlds()) {
loadFile = new File(worldFolder, "res_" + world.getName() + ".yml");
if (loadFile.isFile()) {
yml = new YMLSaveHelper(loadFile);
@@ -325,7 +310,7 @@ public class Residence extends JavaPlugin {
@Override
public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) {
final ResidenceCommandEvent cevent = new ResidenceCommandEvent(command.getName(), args, sender);
server.getPluginManager().callEvent(cevent);
this.getServer().getPluginManager().callEvent(cevent);
if (cevent.isCancelled()) {
return true;
}
@@ -335,10 +320,11 @@ public class Residence extends JavaPlugin {
@Override
public void onDisable() {
taskmanager.cancelall();
final DataBackup backup = new DataBackup(this);
if (init) {
try {
saveYml();
DataBackup.run(this);
backup.backup();
} catch (final Exception ex) {
this.getLogger().warning("领地数据保存错误,可能造成部分领地丢失,请尝试恢复备份文件!");
this.getLogger().warning("错误: " + ex);
@@ -349,12 +335,10 @@ public class Residence extends JavaPlugin {
@Override
public void onEnable() {
try {
log = this.getLogger();
bukkitver = Float.parseFloat(this.getServer().getBukkitVersion().substring(0, 3));
init = false;
deleteConfirm = new HashMap<String, String>();
resadminToggle = new ArrayList<String>();
server = this.getServer();
dataFolder = this.getDataFolder();
if (!dataFolder.isDirectory()) {
dataFolder.mkdirs();
@@ -362,11 +346,11 @@ public class Residence extends JavaPlugin {
cmanager = new ConfigManager(this);
final String multiworld = cmanager.getMultiworldPlugin();
if (multiworld != null) {
final Plugin plugin = server.getPluginManager().getPlugin(multiworld);
final Plugin plugin = this.getServer().getPluginManager().getPlugin(multiworld);
if (plugin != null) {
if (!plugin.isEnabled()) {
this.getLogger().info(" - 加载多世界插件: " + multiworld);
server.getPluginManager().enablePlugin(plugin);
this.getServer().getPluginManager().enablePlugin(plugin);
}
}
}
@@ -445,8 +429,8 @@ public class Residence extends JavaPlugin {
return;
}
FlagPermissions.initValidFlags();
final Plugin p = server.getPluginManager().getPlugin("WorldEdit");
if (p != null) {
final Plugin wep = this.getServer().getPluginManager().getPlugin("WorldEdit");
if (wep != null) {
smanager = new WorldEditSelectionManager(this);
useWorldEdit = true;
this.getLogger().info("发现 WorldEdit");
@@ -470,13 +454,13 @@ public class Residence extends JavaPlugin {
firstenable = false;
} else {
plistener.reload();
plistener = new ResidencePlayerListener(this);
}
fmanager = new FlagManager(this);
fmanager.init();
taskmanager.add(server.getScheduler().runTaskTimer(this, new HealTask(this), 20, 20));
taskmanager.add(this.getServer().getScheduler().runTaskTimer(this, new HealTask(this), 20, 20));
hdmcnd = new HandlerMainCommand(this);
hdmcnd.registerCommand(new CommandRc(this));
@@ -487,16 +471,17 @@ public class Residence extends JavaPlugin {
int autosaveInt = cmanager.getAutoSaveInterval();
autosaveInt = autosaveInt < 1 ? 1 : autosaveInt * 60 * 20;
taskmanager.add(server.getScheduler().runTaskTimer(this, new AutoSaveTask(this), autosaveInt, autosaveInt));
taskmanager.add(this.getServer().getScheduler().runTaskTimer(this, new AutoSaveTask(this), autosaveInt, autosaveInt));
if (cmanager.useLeases()) {
int leaseInterval = cmanager.getLeaseCheckInterval();
leaseInterval = leaseInterval < 1 ? 1 : leaseInterval * 60 * 20;
taskmanager.add(server.getScheduler().runTaskTimer(this, new LeaseTask(this), leaseInterval, leaseInterval));
taskmanager.add(this.getServer().getScheduler().runTaskTimer(this, new LeaseTask(this), leaseInterval, leaseInterval));
}
if (cmanager.enabledRentSystem()) {
int rentint = cmanager.getRentCheckInterval();
rentint = rentint < 1 ? 1 : rentint * 60 * 20;
taskmanager.add(server.getScheduler().runTaskTimer(this, new RentTask(this), rentint, rentint));
taskmanager.add(this.getServer().getScheduler().runTaskTimer(this, new RentTask(this), rentint, rentint));
}
for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
if (this.getPermissionManager().isResidenceAdmin(player)) {
@@ -525,7 +510,7 @@ public class Residence extends JavaPlugin {
}
public void reloadPlugin() {
final PluginManager pm = server.getPluginManager();
final PluginManager pm = this.getServer().getPluginManager();
pm.disablePlugin(this);
pm.enablePlugin(this);
}
@@ -547,7 +532,7 @@ public class Residence extends JavaPlugin {
final File tmpFile = new File(worldFolder, "tmp_res_" + entry.getKey() + ".yml");
yml = new YMLSaveHelper(tmpFile);
yml.getRoot().put("Version", saveVersion);
final World world = server.getWorld(entry.getKey());
final World world = this.getServer().getWorld(entry.getKey());
if (world != null) {
yml.getRoot().put("Seed", world.getSeed());
}