1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2024-10-31 22:38:48 +00:00

fix some bug and update to 2.7.0.1...

This commit is contained in:
j502647092 2015-05-27 19:17:48 +08:00
parent 984b8608a0
commit b1cf3b7ccd
6 changed files with 973 additions and 967 deletions

View File

@ -1,7 +1,12 @@
#Residence-Fix
==注意: 只兼容1.8以上版本==
领地插件无UUID版本
配置文件全部UTF-8编码处理
修复漏洞到最新版本
去除自动更新
#Residence - Self serve area protection system

132
pom.xml
View File

@ -1,67 +1,67 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cn.CityCraft</groupId>
<artifactId>Residence</artifactId>
<version>2.7.0.0-SNAPSHOT</version>
<name>Residence</name>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<type>jar</type>
<version>1.8.3-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.earth2me</groupId>
<artifactId>essentials</artifactId>
<version>2.9.6</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Essentials.jar</systemPath>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.5</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Vault.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>WorldEdit</artifactId>
<version>5.4.5</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/WorldEdit.jar</systemPath>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cn.CityCraft</groupId>
<artifactId>Residence</artifactId>
<version>2.7.0.1-SNAPSHOT</version>
<name>Residence</name>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<type>jar</type>
<version>1.8.3-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.earth2me</groupId>
<artifactId>essentials</artifactId>
<version>2.9.6</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Essentials.jar</systemPath>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.5</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Vault.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>WorldEdit</artifactId>
<version>5.4.5</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/WorldEdit.jar</systemPath>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>

View File

@ -111,17 +111,17 @@ public class PermissionManager {
perms = vault;
Logger.getLogger("Minecraft").log(
Level.INFO,
"[Residence] Found Vault using permissions plugin:"
"[Residence] 发现 Vault 使用权限系统:"
+ vault.getPermissionsName());
return;
} else {
Logger.getLogger("Minecraft")
.log(Level.INFO,
"[Residence] Found Vault, but Vault reported no usable permissions system...");
"[Residence] 发现 Vault, 但是 Vault 未找到权限系统...");
}
}
Logger.getLogger("Minecraft").log(Level.INFO,
"[Residence] Permissions plugin NOT FOUND!");
"[Residence] 权限系统未找到!");
}
private void readConfig(FileConfiguration config) {
@ -149,8 +149,8 @@ public class PermissionManager {
}
} catch (Exception ex) {
System.out
.println("[Residence] Error parsing group from config:"
+ key + " Exception:" + ex);
.println("[Residence] 错误 从配置文件读取:"
+ key + " 抛出异常:" + ex);
}
}
}

View File

@ -187,6 +187,7 @@ public class FlagPermissions {
addMaterialToUseFlag(Material.DIODE_BLOCK_ON, "diode");
addMaterialToUseFlag(Material.WORKBENCH, "table");
addMaterialToUseFlag(Material.WOODEN_DOOR, "door");
/* 1.8 Doors */
addMaterialToUseFlag(Material.SPRUCE_DOOR, "door");
addMaterialToUseFlag(Material.BIRCH_DOOR, "door");

View File

@ -1,49 +1,49 @@
name: Residence
main: com.bekvon.bukkit.residence.ResidenceCommandListener
version: 2.7.0.0
website: http://www.spigotmc.org/resources/residence-reloaded-1-8.2697/
description: Cuboid Residence Plugin
authors: [bekvon,nate302,t00thpick1,喵♂呜]
contributors: [lemon42,smbarbour,inorixu,Shayana_fr]
softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit,My Worlds]
commands:
res:
description: Manage Residences
usage: §c使用/res ? 获取更多帮助.
residence:
description: Manage Residences
usage: §c使用/residence ? 获取更多帮助.
resadmin:
description: Residence admin functions.
usage: §c使用/res ? or /resadmin ? 获取更多帮助.
resreload:
description: 重载领地插件.
usage: §c使用/resreload
resload:
description: 载入保存在配置文件的数据.
usage: §c使用/resload
rc:
description: §c在领地频道聊天.
usage: §c使用/rc 切换频道, 或者 /rc <message>发送消息.
resworld:
description: §c移除某个世界所有的领地.
usage: §c使用/resworld remove [world] 移除世界所有领地.
permissions:
residence.admin:
description: Gives you access to /resadmin
default: op
residence.admin.tp:
description: Allows to override tp flag
default: op
residence.admin.move:
description: Allows to override move flag
default: op
residence.create:
description: Allows you to create residences
default: op
residence.select:
description: Allows you to select an area to make residences
default: op
residence.versioncheck:
description: Notice to new version after connect
default: op
name: Residence
main: com.bekvon.bukkit.residence.ResidenceCommandListener
version: 2.7.0.1
website: http://www.spigotmc.org/resources/residence-reloaded-1-8.2697/
description: Cuboid Residence Plugin
authors: [bekvon,nate302,t00thpick1,喵♂呜]
contributors: [lemon42,smbarbour,inorixu,Shayana_fr]
softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit,My Worlds]
commands:
res:
description: Manage Residences
usage: §c使用/res ? 获取更多帮助.
residence:
description: Manage Residences
usage: §c使用/residence ? 获取更多帮助.
resadmin:
description: Residence admin functions.
usage: §c使用/res ? or /resadmin ? 获取更多帮助.
resreload:
description: 重载领地插件.
usage: §c使用/resreload
resload:
description: 载入保存在配置文件的数据.
usage: §c使用/resload
rc:
description: §c在领地频道聊天.
usage: §c使用/rc 切换频道, 或者 /rc <message>发送消息.
resworld:
description: §c移除某个世界所有的领地.
usage: §c使用/resworld remove [world] 移除世界所有领地.
permissions:
residence.admin:
description: Gives you access to /resadmin
default: op
residence.admin.tp:
description: Allows to override tp flag
default: op
residence.admin.move:
description: Allows to override move flag
default: op
residence.create:
description: Allows you to create residences
default: op
residence.select:
description: Allows you to select an area to make residences
default: op
residence.versioncheck:
description: Notice to new version after connect
default: op