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

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;
}