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.6.x版本部分不存在的方法...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2016-02-06 11:50:26 +08:00
parent ffd4076549
commit 27f36c573d
3 changed files with 72 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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.6</version> <version>2.8.1.7</version>
<name>Residence</name> <name>Residence</name>
<description>重制版本的领地插件 - 喵♂呜</description> <description>重制版本的领地插件 - 喵♂呜</description>
<ciManagement> <ciManagement>
@@ -59,8 +59,9 @@
</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;c删除所谓的&amp;4"DDOS"&amp;c模块&amp;e停止插件所有更新...&amp;a你们提交PullRequest我还是会合并的...</update.description> <update.description>&amp;c屏蔽1.6.x版本部分不存在的方法...</update.description>
<env.BUILD_NUMBER>Debug</env.BUILD_NUMBER> <update.changes></update.changes>
<env.GIT_COMMIT>Debug</env.GIT_COMMIT>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<repositories> <repositories>

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

@@ -114,7 +114,13 @@ public class ResidenceEntityListener implements Listener {
srcpvp = srcarea.getPermissions().has("pvp", true); srcpvp = srcarea.getPermissions().has("pvp", true);
} }
ent = attackevent.getEntity(); ent = attackevent.getEntity();
if ((ent instanceof Player || tamedWolf) && (damager instanceof Player || (damager instanceof Arrow && (((Arrow) damager).getShooter() instanceof Player)))) { // 屏蔽1.6.x不存在getShooter方法导致的报错...
boolean isPlayerArrow = false;
try {
isPlayerArrow = damager instanceof Arrow && (((Arrow) damager).getShooter() instanceof Player);
} catch (final Exception e) {
}
if ((ent instanceof Player || tamedWolf) && (damager instanceof Player || isPlayerArrow)) {
Player attacker = null; Player attacker = null;
if (damager instanceof Player) { if (damager instanceof Player) {
attacker = (Player) damager; attacker = (Player) damager;
@@ -189,8 +195,7 @@ public class ResidenceEntityListener implements Listener {
return; return;
} }
// Note: Location of entity, not player; otherwise player could // Note: Location of entity, not player; otherwise player could stand outside of res and still damage
// stand outside of res and still damage
final Location loc = event.getEntity().getLocation(); final Location loc = event.getEntity().getLocation();
final ClaimedResidence res = plugin.getResidenceManager().getByLoc(loc); final ClaimedResidence res = plugin.getResidenceManager().getByLoc(loc);
if (res != null) { if (res != null) {

108
src/main/resources/plugin.yml
View File

@@ -1,48 +1,60 @@
name: ${project.artifactId} name: ${project.artifactId}
description: ${project.description} description: ${project.description}
main: ${project.groupId}.${project.artifactId}.${project.artifactId}Main main: ${project.groupId}.${project.artifactId}.${project.artifactId}Main
version: ${project.version}-Build#${env.BUILD_NUMBER} version: ${project.version}-git-${env.GIT_COMMIT}
website: ${jenkins.url}/job/${project.artifactId}/ website: ${jenkins.url}/job/${project.artifactId}/
authors: [bekvon,nate302,t00thpick1,喵♂呜] authors:
contributors: [lemon42,smbarbour,inorixu,Shayana_fr] - bekvon
softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit] - nate302
commands: - t00thpick1
residence: - 喵♂呜
description: 管理领地. contributors:
aliases: [res] - lemon42
usage: §c使用/res ? 或 /residence ? 或 /resadmin ? 获取更多帮助. - smbarbour
resadmin: - inorixu
description: 管理员命令 管理领地. - Shayana_fr
permission: residence.admin softdepend:
usage: §c使用/res ? 或 /residence ? 或 /resadmin ? 获取更多帮助. - Vault
resreload: - Essentials
description: 重载领地插件. - WorldEdit
usage: §c使用/resreload commands:
resload: residence:
description: 载入保存在配置文件的数据. description: 管理领地.
usage: §c使用/resload aliases:
rc: - res
description: §c在领地频道聊天. usage: §c使用/res ? 或 /residence ? 或 /resadmin ? 获取更多帮助.
usage: §c使用/rc 切换频道, 或者 /rc <message>发送消息. resadmin:
resworld: description: 管理员命令 管理领地.
description: §c移除某个世界所有的领地. permission: residence.admin
usage: §c使用/resworld remove [world] 移除世界所有领地. usage: §c使用/res ? 或 /residence ? 或 /resadmin ? 获取更多帮助.
permissions: resreload:
residence.admin: description: 重载领地插件.
description: 允许使用 /resadmin. usage: §c使用/resreload
default: op resload:
residence.admin.tp: description: 载入保存在配置文件的数据.
description: Allows to override tp flag usage: §c使用/resload
default: op rc:
residence.admin.move: description: §c在领地频道聊天.
description: Allows to override move flag usage: §c使用/rc 切换频道, 或者 /rc <message>发送消息.
default: op resworld:
residence.create: description: §c移除某个世界所有的领地.
description: Allows you to create residences usage: §c使用/resworld remove [world] 移除世界所有领地.
default: op permissions:
residence.select: residence.admin:
description: Allows you to select an area to make residences description: 允许使用 /resadmin.
default: true default: op
residence.versioncheck: residence.admin.tp:
description: Notice to new version after connect description: 允许无视tp标签
default: op default: op
residence.admin.move:
description: 允许无视move标签
default: op
residence.create:
description: 允许创建领地
default: op
residence.select:
description: 允许选择区域
default: true
residence.versioncheck:
description: 接受更新通知
default: op