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

添加自动检测 1.7版本开启ActionBar时自动关闭...

Browse Source
This commit is contained in:
502647092
2015-11-11 16:21:52 +08:00
parent 0e63b7f439
commit 251bc9e1bf
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>cn.citycraft</groupId> <groupId>cn.citycraft</groupId>
<artifactId>Residence</artifactId> <artifactId>Residence</artifactId>
<version>2.8.1.1</version> <version>2.8.1.2</version>
<name>Residence</name> <name>Residence</name>
<description>重制版本的领地插件 - 喵♂呜</description> <description>重制版本的领地插件 - 喵♂呜</description>
<build> <build>
@@ -55,7 +55,7 @@
</build> </build>
<properties> <properties>
<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url> <jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
<update.description>&amp;4修复当保存数据时关服导致的领地数据丢失&amp;c修复resreload命令&amp;d清理部分无用代码 修复部分1.8保护失效......</update.description> <update.description>&amp;4添加自动检测 1.7版本开启ActionBar时自动关闭...</update.description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<repositories> <repositories>

12
src/main/java/cn/citycraft/Residence/ResidenceMain.java
View File

@@ -92,7 +92,7 @@ public class ResidenceMain extends JavaPlugin {
protected static ResidenceMain instance; protected static ResidenceMain instance;
private ConfigManager cmanager; private ConfigManager cmanager;
private boolean ver1_8; private boolean vergt1_8;
protected DataBackup backup; protected DataBackup backup;
protected ResidenceBlockListener blistener; protected ResidenceBlockListener blistener;
@@ -249,8 +249,8 @@ public class ResidenceMain extends JavaPlugin {
return wmanager; return wmanager;
} }
public boolean is1_8() { public boolean isGt1_8() {
return ver1_8; return vergt1_8;
} }
public boolean isInit() { public boolean isInit() {
@@ -374,9 +374,9 @@ public class ResidenceMain extends JavaPlugin {
this.getLogger().info("Bukkit 版本: " + this.getServer().getBukkitVersion()); this.getLogger().info("Bukkit 版本: " + this.getServer().getBukkitVersion());
try { try {
Class.forName("org.bukkit.event.player.PlayerInteractAtEntityEvent"); Class.forName("org.bukkit.event.player.PlayerInteractAtEntityEvent");
ver1_8 = true; vergt1_8 = true;
} catch (final Exception e) { } catch (final Exception e) {
ver1_8 = false; vergt1_8 = false;
} }
deleteConfirm = new HashMap<String, String>(); deleteConfirm = new HashMap<String, String>();
resadminToggle = new ArrayList<String>(); resadminToggle = new ArrayList<String>();
@@ -485,7 +485,7 @@ public class ResidenceMain extends JavaPlugin {
plistener1_8 = new ResidencePlayerListener_1_8(this); plistener1_8 = new ResidencePlayerListener_1_8(this);
pm.registerEvents(blistener, this); pm.registerEvents(blistener, this);
pm.registerEvents(plistener, this); pm.registerEvents(plistener, this);
if (is1_8()) { if (isGt1_8()) {
pm.registerEvents(plistener1_8, this); pm.registerEvents(plistener1_8, this);
} }
pm.registerEvents(elistener, this); pm.registerEvents(elistener, this);

2
src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java
View File

@@ -174,7 +174,7 @@ public class ResidenceEntityListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onEntityDamageByEntityEvent(final EntityDamageByEntityEvent event) { public void onEntityDamageByEntityEvent(final EntityDamageByEntityEvent event) {
if (event.getEntityType() == EntityType.ITEM_FRAME || (plugin.is1_8() && event.getEntityType() == EntityType.ARMOR_STAND)) { if (event.getEntityType() == EntityType.ITEM_FRAME || (plugin.isGt1_8() && event.getEntityType() == EntityType.ARMOR_STAND)) {
final Entity dmgr = event.getDamager(); final Entity dmgr = event.getDamager();
Player player; Player player;
if (dmgr instanceof Player) { if (dmgr instanceof Player) {

4
src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java
View File

@@ -341,7 +341,7 @@ public class ResidencePlayerListener implements Listener {
} }
} }
} }
if (plugin.is1_8()) { if (plugin.isGt1_8()) {
if (heldItem == Material.ARMOR_STAND) { if (heldItem == Material.ARMOR_STAND) {
perms = plugin.getPermsByLocForPlayer(block.getRelative(event.getBlockFace()).getLocation(), player); perms = plugin.getPermsByLocForPlayer(block.getRelative(event.getBlockFace()).getLocation(), player);
if (!perms.playerHas(player.getName(), world, "build", true)) { if (!perms.playerHas(player.getName(), world, "build", true)) {
@@ -559,7 +559,7 @@ public class ResidencePlayerListener implements Listener {
return mat == Material.LEVER || mat == Material.STONE_BUTTON || mat == Material.WOOD_BUTTON || mat == Material.WOODEN_DOOR || mat == Material.TRAP_DOOR || mat == Material.FENCE_GATE return mat == Material.LEVER || mat == Material.STONE_BUTTON || mat == Material.WOOD_BUTTON || mat == Material.WOODEN_DOOR || mat == Material.TRAP_DOOR || mat == Material.FENCE_GATE
|| mat == Material.PISTON_BASE || mat == Material.PISTON_STICKY_BASE || mat == Material.DRAGON_EGG || mat == Material.PISTON_BASE || mat == Material.PISTON_STICKY_BASE || mat == Material.DRAGON_EGG
|| plugin.getConfigManager().getCustomBothClick().contains(Integer.valueOf(block.getTypeId())) || plugin.getConfigManager().getCustomBothClick().contains(Integer.valueOf(block.getTypeId()))
|| (plugin.is1_8() && (mat == Material.SPRUCE_DOOR || mat == Material.BIRCH_DOOR || mat == Material.JUNGLE_DOOR || mat == Material.ACACIA_DOOR || mat == Material.DARK_OAK_DOOR || (plugin.isGt1_8() && (mat == Material.SPRUCE_DOOR || mat == Material.BIRCH_DOOR || mat == Material.JUNGLE_DOOR || mat == Material.ACACIA_DOOR || mat == Material.DARK_OAK_DOOR
|| mat == Material.SPRUCE_FENCE_GATE || mat == Material.BIRCH_FENCE_GATE || mat == Material.JUNGLE_FENCE_GATE || mat == Material.ACACIA_FENCE_GATE || mat == Material.SPRUCE_FENCE_GATE || mat == Material.BIRCH_FENCE_GATE || mat == Material.JUNGLE_FENCE_GATE || mat == Material.ACACIA_FENCE_GATE
|| mat == Material.DARK_OAK_FENCE_GATE)); || mat == Material.DARK_OAK_FENCE_GATE));
} }

6
src/main/java/cn/citycraft/Residence/manager/ConfigManager.java
View File

@@ -16,6 +16,7 @@ import org.bukkit.configuration.file.FileConfiguration;
import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.bekvon.bukkit.residence.protection.FlagPermissions;
import cn.citycraft.PluginHelper.config.FileConfig; import cn.citycraft.PluginHelper.config.FileConfig;
import cn.citycraft.PluginHelper.utils.ActionBar;
import cn.citycraft.Residence.ResidenceMain; import cn.citycraft.Residence.ResidenceMain;
/** /**
@@ -256,6 +257,11 @@ public class ConfigManager {
} catch (final Exception e) { } catch (final Exception e) {
throw new RuntimeException("领地配置文件载入错误...", e); throw new RuntimeException("领地配置文件载入错误...", e);
} }
if (actionBar && plugin.isGt1_8()) {
actionBar = ActionBar.init();
} else {
actionBar = false;
}
final ConfigurationSection node = config.getConfigurationSection("Global.GroupDefault"); final ConfigurationSection node = config.getConfigurationSection("Global.GroupDefault");
if (node != null) { if (node != null) {
final Set<String> keys = node.getConfigurationSection(defaultGroup).getKeys(false); final Set<String> keys = node.getConfigurationSection(defaultGroup).getKeys(false);

2
src/main/java/cn/citycraft/Residence/manager/EntityManager.java
View File

@@ -29,7 +29,7 @@ public class EntityManager {
public boolean isAnimal(final Entity ent) { public boolean isAnimal(final Entity ent) {
return (ent instanceof Horse || ent instanceof Bat || ent instanceof Snowman || ent instanceof IronGolem || ent instanceof Ocelot || ent instanceof Pig || ent instanceof Sheep return (ent instanceof Horse || ent instanceof Bat || ent instanceof Snowman || ent instanceof IronGolem || ent instanceof Ocelot || ent instanceof Pig || ent instanceof Sheep
|| ent instanceof Chicken || ent instanceof Wolf || ent instanceof Cow || ent instanceof Squid || ent instanceof Villager || (plugin.is1_8() && ent instanceof Rabbit)); || ent instanceof Chicken || ent instanceof Wolf || ent instanceof Cow || ent instanceof Squid || ent instanceof Villager || (plugin.isGt1_8() && ent instanceof Rabbit));
} }
public boolean isMonster(final Entity ent) { public boolean isMonster(final Entity ent) {

2
src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java
View File

@@ -184,7 +184,7 @@ public class FlagPermissions {
addMaterialToUseFlag(Material.WORKBENCH, "table"); addMaterialToUseFlag(Material.WORKBENCH, "table");
addMaterialToUseFlag(Material.WOODEN_DOOR, "door"); addMaterialToUseFlag(Material.WOODEN_DOOR, "door");
if (plugin.is1_8()) { if (plugin.isGt1_8()) {
/* 1.8 Doors */ /* 1.8 Doors */
addMaterialToUseFlag(Material.SPRUCE_DOOR, "door"); addMaterialToUseFlag(Material.SPRUCE_DOOR, "door");
addMaterialToUseFlag(Material.BIRCH_DOOR, "door"); addMaterialToUseFlag(Material.BIRCH_DOOR, "door");