1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00

comeplete 1.7-1.8 all version...

Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-09-22 16:23:55 +08:00
parent 710390b5a6
commit 2f1aee005a
11 changed files with 2223 additions and 3107 deletions

View File

@@ -40,6 +40,7 @@ import com.bekvon.bukkit.residence.itemlist.WorldItemManager;
import com.bekvon.bukkit.residence.listeners.ResidenceBlockListener;
import com.bekvon.bukkit.residence.listeners.ResidenceEntityListener;
import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener;
import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener_1_8;
import com.bekvon.bukkit.residence.permissions.PermissionManager;
import com.bekvon.bukkit.residence.persistance.YMLSaveHelper;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
@@ -67,7 +68,7 @@ import cn.citycraft.PluginHelper.config.FileConfig;
*/
public class Residence extends JavaPlugin {
public static String bukkitver;
public static float bukkitver;
protected static ResidenceManager rmanager;
protected static SelectionManager smanager;
protected static PermissionManager gmanager;
@@ -75,6 +76,7 @@ public class Residence extends JavaPlugin {
protected static ResidenceBlockListener blistener;
protected static ResidencePlayerListener plistener;
protected static ResidenceEntityListener elistener;
protected static ResidencePlayerListener_1_8 plistener1_8;
protected static TransactionManager tmanager;
protected static PermissionListManager pmanager;
protected static LeaseManager leasemanager;
@@ -103,40 +105,26 @@ public class Residence extends JavaPlugin {
protected Map<String, String> deleteConfirm;
private Runnable doHeals = new Runnable() {
@Override
public void run() {
plistener.doHeals();
}
private Runnable doHeals = () -> plistener.doHeals();
private Runnable rentExpire = () -> {
rentmanager.checkCurrentRents();
if (cmanager.showIntervalMessages())
getLog().info(" - Rent Expirations checked!");
};
private Runnable rentExpire = new Runnable() {
@Override
public void run() {
rentmanager.checkCurrentRents();
if (cmanager.showIntervalMessages())
getLog().info(" - Rent Expirations checked!");
}
private Runnable leaseExpire = () -> {
leasemanager.doExpirations();
if (cmanager.showIntervalMessages())
getLog().info(" - Lease Expirations checked!");
};
private Runnable leaseExpire = new Runnable() {
@Override
public void run() {
leasemanager.doExpirations();
if (cmanager.showIntervalMessages())
getLog().info(" - Lease Expirations checked!");
}
};
private Runnable autoSave = new Runnable() {
@Override
public void run() {
try {
if (initsuccess)
saveYml();
} catch (Exception ex) {
getLog().warning("领地数据保存错误,可能造成部分领地丢失,请尝试恢复备份文件!");
}
private Runnable autoSave = () -> {
try {
if (initsuccess)
saveYml();
} catch (Exception ex) {
getLog().warning("领地数据保存错误,可能造成部分领地丢失,请尝试恢复备份文件!");
}
};
@@ -235,6 +223,10 @@ public class Residence extends JavaPlugin {
return wmanager;
}
public static boolean is1_8() {
return bukkitver == 1.8;
}
public static boolean isResAdminOn(Player player) {
if (resadminToggle.contains(player.getName()))
return true;
@@ -312,7 +304,7 @@ public class Residence extends JavaPlugin {
public void onEnable() {
try {
log = this.getLogger();
bukkitver = this.getServer().getBukkitVersion().substring(0, 5);
bukkitver = Float.parseFloat(this.getServer().getBukkitVersion().substring(0, 3));
initsuccess = false;
deleteConfirm = new HashMap<String, String>();
resadminToggle = new ArrayList<String>();
@@ -412,9 +404,11 @@ public class Residence extends JavaPlugin {
blistener = new ResidenceBlockListener();
plistener = new ResidencePlayerListener();
elistener = new ResidenceEntityListener();
plistener1_8 = new ResidencePlayerListener_1_8();
PluginManager pm = getServer().getPluginManager();
pm.registerEvents(blistener, this);
pm.registerEvents(plistener, this);
pm.registerEvents(plistener1_8, this);
pm.registerEvents(elistener, this);
firstenable = false;