502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-26 22:06:07 +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

21
src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java
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() {

23
src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java
View File

@@ -21,6 +21,7 @@ import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import com.bekvon.bukkit.residence.Residence;
import com.bekvon.bukkit.residence.event.ResidenceCreationEvent;
@@ -37,13 +38,13 @@ import com.bekvon.bukkit.residence.text.help.InformationPager;
*/
public class ResidenceManager {
protected Map<String, Map<ChunkRef, List<String>>> chunkResidences;
protected Residence plugin;
protected PluginManager pm;
protected Map<String, ClaimedResidence> residences;
Residence plugin;
public ResidenceManager(final Residence plugin) {
this.plugin = plugin;
pm = plugin.getServer().getPluginManager();
residences = new HashMap<String, ClaimedResidence>();
chunkResidences = new HashMap<String, Map<ChunkRef, List<String>>>();
}
@@ -54,13 +55,13 @@ public class ResidenceManager {
if (root == null) {
return resm;
}
for (final World world : plugin.getServ().getWorlds()) {
for (final World world : plugin.getServer().getWorlds()) {
final Map<String, Object> reslist = (Map<String, Object>) root.get(world.getName());
if (reslist != null) {
try {
resm.chunkResidences.put(world.getName(), loadMap(plugin, reslist, resm));
} catch (final Exception ex) {
plugin.getLog().warning("载入世界: " + world.getName() + "的领地数据时发生错误!");
plugin.getLogger().warning("载入世界: " + world.getName() + "的领地数据时发生错误!");
if (plugin.getConfigManager().stopOnSaveError()) {
throw (ex);
}
@@ -144,7 +145,7 @@ public class ResidenceManager {
newRes.setLeaveMessage(group.getDefaultLeaveMessage());
final ResidenceCreationEvent resevent = new ResidenceCreationEvent(player, name, newRes, newArea);
plugin.getServ().getPluginManager().callEvent(resevent);
pm.callEvent(resevent);
if (resevent.isCancelled()) {
return false;
}
@@ -366,7 +367,7 @@ public class ResidenceManager {
reqPlayer.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("NoPermission"));
return;
}
final Player giveplayer = plugin.getServ().getPlayer(targPlayer);
final Player giveplayer = plugin.getServer().getPlayer(targPlayer);
if (giveplayer == null || !giveplayer.isOnline()) {
reqPlayer.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("NotOnline"));
return;
@@ -557,7 +558,7 @@ public class ResidenceManager {
}
}
final ResidenceDeleteEvent resevent = new ResidenceDeleteEvent(player, res, player == null ? DeleteCause.OTHER : DeleteCause.PLAYER_DELETE);
plugin.getServ().getPluginManager().callEvent(resevent);
pm.callEvent(resevent);
if (resevent.isCancelled()) {
return;
}
@@ -611,7 +612,7 @@ public class ResidenceManager {
return false;
}
final ResidenceRenameEvent resevent = new ResidenceRenameEvent(res, newName, oldName);
plugin.getServ().getPluginManager().callEvent(resevent);
pm.callEvent(resevent);
removeChunkList(oldName);
residences.put(newName, res);
residences.remove(oldName);
@@ -646,7 +647,7 @@ public class ResidenceManager {
public Map<String, Object> save() {
final Map<String, Object> worldmap = new LinkedHashMap<String, Object>();
for (final World world : plugin.getServ().getWorlds()) {
for (final World world : plugin.getServer().getWorlds()) {
final Map<String, Object> resmap = new LinkedHashMap<String, Object>();
for (final Entry<String, ClaimedResidence> res : residences.entrySet()) {
if (res.getValue().getWorld().equals(world.getName())) {
@@ -688,7 +689,7 @@ public class ResidenceManager {
final ClaimedResidence res = it.next();
if (res.getOwner().equalsIgnoreCase(owner)) {
final ResidenceDeleteEvent resevent = new ResidenceDeleteEvent(player, res, player == null ? DeleteCause.OTHER : DeleteCause.PLAYER_DELETE);
plugin.getServ().getPluginManager().callEvent(resevent);
pm.callEvent(resevent);
if (resevent.isCancelled()) {
return;
}

30
src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java
View File

@@ -14,6 +14,7 @@ import java.util.Set;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import com.bekvon.bukkit.residence.Residence;
import com.bekvon.bukkit.residence.event.ResidenceFlagChangeEvent;
@@ -30,7 +31,7 @@ import com.bekvon.bukkit.residence.permissions.PermissionManager;
public class ResidencePermissions extends FlagPermissions {
protected String owner;
protected PluginManager pm;
protected ClaimedResidence residence;
protected String world;
Residence plugin;
@@ -38,6 +39,7 @@ public class ResidencePermissions extends FlagPermissions {
public ResidencePermissions(final Residence plugin, final ClaimedResidence res) {
super(plugin);
this.plugin = plugin;
this.pm = plugin.getServer().getPluginManager();
residence = res;
}
@@ -54,7 +56,7 @@ public class ResidencePermissions extends FlagPermissions {
newperms.owner = (String) root.get("OwnerLastKnownName");
}
if (newperms.owner == null) {
plugin.getLog().warning("发现未知所有者的领地,转换为Server Land...");
plugin.getLogger().warning("发现未知所有者的领地,转换为Server Land...");
newperms.owner = "Server Land";
}
newperms.world = (String) root.get("World");
@@ -227,7 +229,7 @@ public class ResidencePermissions extends FlagPermissions {
@Override
public boolean groupHas(final String group, final String flag, final boolean def) {
final ResidenceFlagCheckEvent fc = new ResidenceFlagCheckEvent(residence, flag, FlagType.GROUP, group, def);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isOverriden()) {
return fc.getOverrideValue();
}
@@ -237,7 +239,7 @@ public class ResidencePermissions extends FlagPermissions {
@Override
public boolean has(final String flag, final boolean def) {
final ResidenceFlagCheckEvent fc = new ResidenceFlagCheckEvent(residence, flag, FlagType.RESIDENCE, null, def);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isOverriden()) {
return fc.getOverrideValue();
}
@@ -276,7 +278,7 @@ public class ResidencePermissions extends FlagPermissions {
@Override
public boolean playerHas(final String player, final String world, final String flag, final boolean def) {
final ResidenceFlagCheckEvent fc = new ResidenceFlagCheckEvent(residence, flag, FlagType.PLAYER, player, def);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isOverriden()) {
return fc.getOverrideValue();
}
@@ -286,7 +288,7 @@ public class ResidencePermissions extends FlagPermissions {
public boolean removeAllGroupFlags(final Player player, final String group, final boolean resadmin) {
if (this.hasResidencePermission(player, false) || resadmin) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, player, "ALL", ResidenceFlagChangeEvent.FlagType.GROUP, FlagState.NEITHER, null);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -300,7 +302,7 @@ public class ResidencePermissions extends FlagPermissions {
public boolean removeAllPlayerFlags(final Player player, final String targetPlayer, final boolean resadmin) {
if (this.hasResidencePermission(player, false) || resadmin) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, player, "ALL", ResidenceFlagChangeEvent.FlagType.RESIDENCE, FlagState.NEITHER, null);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -326,7 +328,7 @@ public class ResidencePermissions extends FlagPermissions {
final FlagState state = FlagPermissions.stringToFlagState(flagstate);
if (checkCanSetFlag(player, flag, state, true, resadmin)) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, player, flag, ResidenceFlagChangeEvent.FlagType.RESIDENCE, state, null);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -341,7 +343,7 @@ public class ResidencePermissions extends FlagPermissions {
@Override
public boolean setFlag(final String flag, final FlagState state) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, null, flag, ResidenceFlagChangeEvent.FlagType.RESIDENCE, state, null);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -399,7 +401,7 @@ public class ResidencePermissions extends FlagPermissions {
if (checkCanSetFlag(player, flag, state, false, resadmin)) {
if (plugin.getPermissionManager().hasGroup(group)) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, player, flag, ResidenceFlagChangeEvent.FlagType.GROUP, state, group);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -418,7 +420,7 @@ public class ResidencePermissions extends FlagPermissions {
@Override
public boolean setGroupFlag(final String group, final String flag, final FlagState state) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, null, flag, ResidenceFlagChangeEvent.FlagType.GROUP, state, group);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -427,7 +429,7 @@ public class ResidencePermissions extends FlagPermissions {
public void setOwner(final String newOwner, final boolean resetFlags) {
final ResidenceOwnerChangeEvent ownerchange = new ResidenceOwnerChangeEvent(residence, newOwner);
plugin.getServ().getPluginManager().callEvent(ownerchange);
pm.callEvent(ownerchange);
owner = newOwner;
if (resetFlags) {
this.applyDefaultFlags();
@@ -441,7 +443,7 @@ public class ResidencePermissions extends FlagPermissions {
final FlagState state = FlagPermissions.stringToFlagState(flagstate);
if (checkCanSetFlag(player, flag, state, false, resadmin)) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, player, flag, ResidenceFlagChangeEvent.FlagType.PLAYER, state, targetPlayer);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}
@@ -456,7 +458,7 @@ public class ResidencePermissions extends FlagPermissions {
@Override
public boolean setPlayerFlag(final String player, final String flag, final FlagState state) {
final ResidenceFlagChangeEvent fc = new ResidenceFlagChangeEvent(residence, null, flag, ResidenceFlagChangeEvent.FlagType.PLAYER, state, player);
plugin.getServ().getPluginManager().callEvent(fc);
pm.callEvent(fc);
if (fc.isCancelled()) {
return false;
}