From 251bc9e1bf2d71324849de2c7e34ef453f4c1822 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Wed, 11 Nov 2015 16:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=201.7=E7=89=88=E6=9C=AC=E5=BC=80=E5=90=AFActionBar?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../java/cn/citycraft/Residence/ResidenceMain.java | 12 ++++++------ .../Residence/listeners/ResidenceEntityListener.java | 2 +- .../Residence/listeners/ResidencePlayerListener.java | 4 ++-- .../citycraft/Residence/manager/ConfigManager.java | 6 ++++++ .../citycraft/Residence/manager/EntityManager.java | 2 +- .../bukkit/residence/protection/FlagPermissions.java | 2 +- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index c8b8671..6822d26 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.citycraft Residence - 2.8.1.1 + 2.8.1.2 Residence 重制版本的领地插件 - 喵♂呜 @@ -55,7 +55,7 @@ http://ci.citycraft.cn:8080 - &4修复当保存数据时关服导致的领地数据丢失&c修复resreload命令&d清理部分无用代码 修复部分1.8保护失效...... + &4添加自动检测 1.7版本开启ActionBar时自动关闭... UTF-8 diff --git a/src/main/java/cn/citycraft/Residence/ResidenceMain.java b/src/main/java/cn/citycraft/Residence/ResidenceMain.java index 32aaa20..57b82c1 100644 --- a/src/main/java/cn/citycraft/Residence/ResidenceMain.java +++ b/src/main/java/cn/citycraft/Residence/ResidenceMain.java @@ -92,7 +92,7 @@ public class ResidenceMain extends JavaPlugin { protected static ResidenceMain instance; private ConfigManager cmanager; - private boolean ver1_8; + private boolean vergt1_8; protected DataBackup backup; protected ResidenceBlockListener blistener; @@ -249,8 +249,8 @@ public class ResidenceMain extends JavaPlugin { return wmanager; } - public boolean is1_8() { - return ver1_8; + public boolean isGt1_8() { + return vergt1_8; } public boolean isInit() { @@ -374,9 +374,9 @@ public class ResidenceMain extends JavaPlugin { this.getLogger().info("Bukkit 版本: " + this.getServer().getBukkitVersion()); try { Class.forName("org.bukkit.event.player.PlayerInteractAtEntityEvent"); - ver1_8 = true; + vergt1_8 = true; } catch (final Exception e) { - ver1_8 = false; + vergt1_8 = false; } deleteConfirm = new HashMap(); resadminToggle = new ArrayList(); @@ -485,7 +485,7 @@ public class ResidenceMain extends JavaPlugin { plistener1_8 = new ResidencePlayerListener_1_8(this); pm.registerEvents(blistener, this); pm.registerEvents(plistener, this); - if (is1_8()) { + if (isGt1_8()) { pm.registerEvents(plistener1_8, this); } pm.registerEvents(elistener, this); diff --git a/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java index 8047fce..fca6ea6 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java @@ -174,7 +174,7 @@ public class ResidenceEntityListener implements Listener { @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) 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(); Player player; if (dmgr instanceof Player) { diff --git a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java index 04c5e30..8b925e0 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java @@ -341,7 +341,7 @@ public class ResidencePlayerListener implements Listener { } } } - if (plugin.is1_8()) { + if (plugin.isGt1_8()) { if (heldItem == Material.ARMOR_STAND) { perms = plugin.getPermsByLocForPlayer(block.getRelative(event.getBlockFace()).getLocation(), player); 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 || mat == Material.PISTON_BASE || mat == Material.PISTON_STICKY_BASE || mat == Material.DRAGON_EGG || 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.DARK_OAK_FENCE_GATE)); } diff --git a/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java b/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java index 72bfbc3..86c1849 100644 --- a/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java +++ b/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java @@ -16,6 +16,7 @@ import org.bukkit.configuration.file.FileConfiguration; import com.bekvon.bukkit.residence.protection.FlagPermissions; import cn.citycraft.PluginHelper.config.FileConfig; +import cn.citycraft.PluginHelper.utils.ActionBar; import cn.citycraft.Residence.ResidenceMain; /** @@ -256,6 +257,11 @@ public class ConfigManager { } catch (final Exception e) { throw new RuntimeException("领地配置文件载入错误...", e); } + if (actionBar && plugin.isGt1_8()) { + actionBar = ActionBar.init(); + } else { + actionBar = false; + } final ConfigurationSection node = config.getConfigurationSection("Global.GroupDefault"); if (node != null) { final Set keys = node.getConfigurationSection(defaultGroup).getKeys(false); diff --git a/src/main/java/cn/citycraft/Residence/manager/EntityManager.java b/src/main/java/cn/citycraft/Residence/manager/EntityManager.java index b2b44a5..5c2b80e 100644 --- a/src/main/java/cn/citycraft/Residence/manager/EntityManager.java +++ b/src/main/java/cn/citycraft/Residence/manager/EntityManager.java @@ -29,7 +29,7 @@ public class EntityManager { 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 - || 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) { diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java index adff4fd..e6f32ac 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java @@ -184,7 +184,7 @@ public class FlagPermissions { addMaterialToUseFlag(Material.WORKBENCH, "table"); addMaterialToUseFlag(Material.WOODEN_DOOR, "door"); - if (plugin.is1_8()) { + if (plugin.isGt1_8()) { /* 1.8 Doors */ addMaterialToUseFlag(Material.SPRUCE_DOOR, "door"); addMaterialToUseFlag(Material.BIRCH_DOOR, "door");