1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-25 21:56:06 +00:00

clean up and release version...

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

View File

@@ -74,13 +74,13 @@ public class LeaseManager {
res.getBank().subtract(cost);
renewed = true;
if (plugin.getConfigManager().debugEnabled()) {
System.out.println("Lease Renewed From Residence Bank: " + resname);
plugin.getLogger().info("Lease Renewed From Residence Bank: " + resname);
}
} else if (plugin.getEconomyManager().canAfford(owner, cost)) {
if (plugin.getEconomyManager().subtract(owner, cost)) {
renewed = true;
if (plugin.getConfigManager().debugEnabled()) {
System.out.println("Lease Renewed From Economy: " + resname);
plugin.getLogger().info("Lease Renewed From Economy: " + resname);
}
}
}
@@ -88,12 +88,12 @@ public class LeaseManager {
if (!renewed) {
if (!plugin.getConfigManager().enabledRentSystem() || !plugin.getRentManager().isRented(resname)) {
final ResidenceDeleteEvent resevent = new ResidenceDeleteEvent(null, res, DeleteCause.LEASE_EXPIRE);
plugin.getServ().getPluginManager().callEvent(resevent);
plugin.getServer().getPluginManager().callEvent(resevent);
if (!resevent.isCancelled()) {
manager.removeResidence(next.getKey());
it.remove();
if (plugin.getConfigManager().debugEnabled()) {
System.out.println("Lease NOT removed, Removing: " + resname);
plugin.getLogger().info("Lease NOT removed, Removing: " + resname);
}
}
}
@@ -102,11 +102,11 @@ public class LeaseManager {
plugin.getEconomyManager().add("Lease Money", cost);
}
if (plugin.getConfigManager().debugEnabled()) {
System.out.println("Lease Renew Old: " + next.getValue());
plugin.getLogger().info("Lease Renew Old: " + next.getValue());
}
next.setValue(System.currentTimeMillis() + daysToMs(limits.getLeaseGiveTime()));
if (plugin.getConfigManager().debugEnabled()) {
System.out.println("Lease Renew New: " + next.getValue());
plugin.getLogger().info("Lease Renew New: " + next.getValue());
}
}
}
@@ -151,12 +151,7 @@ public class LeaseManager {
final ClaimedResidence res = manager.getByName(area);
final int amount = (int) Math.ceil(res.getTotalSize() * cost);
if (cost != 0D) {
// Account account =
// iConomy.getBank().getAccount(player.getName());
if (econ.canAfford(player.getName(), amount)/*
* account.hasEnough(
* amount)
*/) {
if (econ.canAfford(player.getName(), amount)) {
econ.subtract(player.getName(), amount);
econ.add("Lease Money", amount);
player.sendMessage(ChatColor.GREEN + plugin.getLanguage().getPhrase("MoneyCharged",
@@ -193,7 +188,7 @@ public class LeaseManager {
this.setExpireTime(null, element, group.getLeaseGiveTime());
}
}
System.out.println("[Residence] - Set default leases.");
plugin.getLogger().info(" - Set default leases.");
}
public Map<String, Long> save() {