mirror of
https://e.coding.net/circlecloud/Residence.git
synced 2025-11-24 21:46:16 +00:00
fix some bug and update to 2.7.0.1...
This commit is contained in:
j502647092
@@ -1,7 +1,12 @@
|
|||||||
#Residence-Fix
|
#Residence-Fix
|
||||||
|
==注意: 只兼容1.8以上版本==
|
||||||
|
|
||||||
领地插件无UUID版本
|
领地插件无UUID版本
|
||||||
|
|
||||||
配置文件全部UTF-8编码处理
|
配置文件全部UTF-8编码处理
|
||||||
|
|
||||||
修复漏洞到最新版本
|
修复漏洞到最新版本
|
||||||
|
|
||||||
去除自动更新
|
去除自动更新
|
||||||
|
|
||||||
#Residence - Self serve area protection system
|
#Residence - Self serve area protection system
|
||||||
|
|||||||
132
pom.xml
132
pom.xml
@@ -1,67 +1,67 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<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">
|
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>cn.CityCraft</groupId>
|
<groupId>cn.CityCraft</groupId>
|
||||||
<artifactId>Residence</artifactId>
|
<artifactId>Residence</artifactId>
|
||||||
<version>2.7.0.0-SNAPSHOT</version>
|
<version>2.7.0.1-SNAPSHOT</version>
|
||||||
<name>Residence</name>
|
<name>Residence</name>
|
||||||
<build>
|
<build>
|
||||||
<sourceDirectory>src</sourceDirectory>
|
<sourceDirectory>src</sourceDirectory>
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
<directory>src</directory>
|
<directory>src</directory>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>**/*.java</exclude>
|
<exclude>**/*.java</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.1</version>
|
<version>3.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.7</source>
|
||||||
<target>1.7</target>
|
<target>1.7</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>spigot-repo</id>
|
<id>spigot-repo</id>
|
||||||
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot-api</artifactId>
|
<artifactId>spigot-api</artifactId>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<version>1.8.3-R0.1-SNAPSHOT</version>
|
<version>1.8.3-R0.1-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.earth2me</groupId>
|
<groupId>com.earth2me</groupId>
|
||||||
<artifactId>essentials</artifactId>
|
<artifactId>essentials</artifactId>
|
||||||
<version>2.9.6</version>
|
<version>2.9.6</version>
|
||||||
<scope>system</scope>
|
<scope>system</scope>
|
||||||
<systemPath>${project.basedir}/lib/Essentials.jar</systemPath>
|
<systemPath>${project.basedir}/lib/Essentials.jar</systemPath>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.milkbowl.vault</groupId>
|
<groupId>net.milkbowl.vault</groupId>
|
||||||
<artifactId>VaultAPI</artifactId>
|
<artifactId>VaultAPI</artifactId>
|
||||||
<version>1.5</version>
|
<version>1.5</version>
|
||||||
<scope>system</scope>
|
<scope>system</scope>
|
||||||
<systemPath>${project.basedir}/lib/Vault.jar</systemPath>
|
<systemPath>${project.basedir}/lib/Vault.jar</systemPath>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sk89q</groupId>
|
<groupId>com.sk89q</groupId>
|
||||||
<artifactId>WorldEdit</artifactId>
|
<artifactId>WorldEdit</artifactId>
|
||||||
<version>5.4.5</version>
|
<version>5.4.5</version>
|
||||||
<scope>system</scope>
|
<scope>system</scope>
|
||||||
<systemPath>${project.basedir}/lib/WorldEdit.jar</systemPath>
|
<systemPath>${project.basedir}/lib/WorldEdit.jar</systemPath>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -111,17 +111,17 @@ public class PermissionManager {
|
|||||||
perms = vault;
|
perms = vault;
|
||||||
Logger.getLogger("Minecraft").log(
|
Logger.getLogger("Minecraft").log(
|
||||||
Level.INFO,
|
Level.INFO,
|
||||||
"[Residence] Found Vault using permissions plugin:"
|
"[Residence] 发现 Vault 使用权限系统:"
|
||||||
+ vault.getPermissionsName());
|
+ vault.getPermissionsName());
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
Logger.getLogger("Minecraft")
|
Logger.getLogger("Minecraft")
|
||||||
.log(Level.INFO,
|
.log(Level.INFO,
|
||||||
"[Residence] Found Vault, but Vault reported no usable permissions system...");
|
"[Residence] 发现 Vault, 但是 Vault 未找到权限系统...");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Logger.getLogger("Minecraft").log(Level.INFO,
|
Logger.getLogger("Minecraft").log(Level.INFO,
|
||||||
"[Residence] Permissions plugin NOT FOUND!");
|
"[Residence] 权限系统未找到!");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readConfig(FileConfiguration config) {
|
private void readConfig(FileConfiguration config) {
|
||||||
@@ -149,8 +149,8 @@ public class PermissionManager {
|
|||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
System.out
|
System.out
|
||||||
.println("[Residence] Error parsing group from config:"
|
.println("[Residence] 错误 从配置文件读取:"
|
||||||
+ key + " Exception:" + ex);
|
+ key + " 抛出异常:" + ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,6 +187,7 @@ public class FlagPermissions {
|
|||||||
addMaterialToUseFlag(Material.DIODE_BLOCK_ON, "diode");
|
addMaterialToUseFlag(Material.DIODE_BLOCK_ON, "diode");
|
||||||
addMaterialToUseFlag(Material.WORKBENCH, "table");
|
addMaterialToUseFlag(Material.WORKBENCH, "table");
|
||||||
addMaterialToUseFlag(Material.WOODEN_DOOR, "door");
|
addMaterialToUseFlag(Material.WOODEN_DOOR, "door");
|
||||||
|
|
||||||
/* 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");
|
||||||
|
|||||||
@@ -1,49 +1,49 @@
|
|||||||
name: Residence
|
name: Residence
|
||||||
main: com.bekvon.bukkit.residence.ResidenceCommandListener
|
main: com.bekvon.bukkit.residence.ResidenceCommandListener
|
||||||
version: 2.7.0.0
|
version: 2.7.0.1
|
||||||
website: http://www.spigotmc.org/resources/residence-reloaded-1-8.2697/
|
website: http://www.spigotmc.org/resources/residence-reloaded-1-8.2697/
|
||||||
description: Cuboid Residence Plugin
|
description: Cuboid Residence Plugin
|
||||||
authors: [bekvon,nate302,t00thpick1,喵♂呜]
|
authors: [bekvon,nate302,t00thpick1,喵♂呜]
|
||||||
contributors: [lemon42,smbarbour,inorixu,Shayana_fr]
|
contributors: [lemon42,smbarbour,inorixu,Shayana_fr]
|
||||||
softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit,My Worlds]
|
softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit,My Worlds]
|
||||||
commands:
|
commands:
|
||||||
res:
|
res:
|
||||||
description: Manage Residences
|
description: Manage Residences
|
||||||
usage: §c使用/res ? 获取更多帮助.
|
usage: §c使用/res ? 获取更多帮助.
|
||||||
residence:
|
residence:
|
||||||
description: Manage Residences
|
description: Manage Residences
|
||||||
usage: §c使用/residence ? 获取更多帮助.
|
usage: §c使用/residence ? 获取更多帮助.
|
||||||
resadmin:
|
resadmin:
|
||||||
description: Residence admin functions.
|
description: Residence admin functions.
|
||||||
usage: §c使用/res ? or /resadmin ? 获取更多帮助.
|
usage: §c使用/res ? or /resadmin ? 获取更多帮助.
|
||||||
resreload:
|
resreload:
|
||||||
description: 重载领地插件.
|
description: 重载领地插件.
|
||||||
usage: §c使用/resreload
|
usage: §c使用/resreload
|
||||||
resload:
|
resload:
|
||||||
description: 载入保存在配置文件的数据.
|
description: 载入保存在配置文件的数据.
|
||||||
usage: §c使用/resload
|
usage: §c使用/resload
|
||||||
rc:
|
rc:
|
||||||
description: §c在领地频道聊天.
|
description: §c在领地频道聊天.
|
||||||
usage: §c使用/rc 切换频道, 或者 /rc <message>发送消息.
|
usage: §c使用/rc 切换频道, 或者 /rc <message>发送消息.
|
||||||
resworld:
|
resworld:
|
||||||
description: §c移除某个世界所有的领地.
|
description: §c移除某个世界所有的领地.
|
||||||
usage: §c使用/resworld remove [world] 移除世界所有领地.
|
usage: §c使用/resworld remove [world] 移除世界所有领地.
|
||||||
permissions:
|
permissions:
|
||||||
residence.admin:
|
residence.admin:
|
||||||
description: Gives you access to /resadmin
|
description: Gives you access to /resadmin
|
||||||
default: op
|
default: op
|
||||||
residence.admin.tp:
|
residence.admin.tp:
|
||||||
description: Allows to override tp flag
|
description: Allows to override tp flag
|
||||||
default: op
|
default: op
|
||||||
residence.admin.move:
|
residence.admin.move:
|
||||||
description: Allows to override move flag
|
description: Allows to override move flag
|
||||||
default: op
|
default: op
|
||||||
residence.create:
|
residence.create:
|
||||||
description: Allows you to create residences
|
description: Allows you to create residences
|
||||||
default: op
|
default: op
|
||||||
residence.select:
|
residence.select:
|
||||||
description: Allows you to select an area to make residences
|
description: Allows you to select an area to make residences
|
||||||
default: op
|
default: op
|
||||||
residence.versioncheck:
|
residence.versioncheck:
|
||||||
description: Notice to new version after connect
|
description: Notice to new version after connect
|
||||||
default: op
|
default: op
|
||||||
|
|||||||
Reference in New Issue
Block a user