Merge pull request #1 from stan60250/master

Merge

Author: HSGamer

config.yml

@@ -43,4 +43,6 @@ lockables:
 - DARK_OAK_DOOR
 - IRON_DOOR_BLOCK
 protection-exempt:
-- nothing
+- nothing
+disable-worlds:
+- world_without_lockettepro

lang_zh-tw.yml

@@ -0,0 +1,32 @@
+# Traditional Chinese translation by MapleHuang([email protected])
+command-usage: "&6[LockettePro]&bLockettePro 插件說明\n&c1. 為箱子新增或刪除使用者，首先右鍵選取一個告示牌， 然後輸入/lock 行號 玩家名稱 即可\n&c2. 管理員重新載入插件設定，使用 /lock reload\nLockettePro by connection_lost"
+you-can-quick-lock-it: '&6[LockettePro]&6手持告示牌對目標方塊點右鍵即可上鎖'
+you-can-manual-lock-it: '&6[LockettePro]&6貼上一個告示牌並寫上[Private]即可上鎖'
+config-reloaded: '&6[LockettePro]&a設定已重新載入'
+no-permission: '&6[LockettePro]&c權限不足! 無法使用該指令'
+no-sign-selected: '&6[LockettePro]&c請先右鍵選擇一個告示牌'
+sign-need-reselect: '&6[LockettePro]&c請重新選擇一個告示牌'
+line-is-too-long: '&6[LockettePro]&c設定輸入告示牌的文字過長!'
+cannot-change-this-line: '&6[LockettePro]&c無法修改這一行'
+sign-changed: '&6[LockettePro]&a告示牌已修改'
+locked-quick: '&6[LockettePro]&a已成功上鎖'
+additional-sign-added-quick: '&6[LockettePro]&a更多的使用者告示牌已新增'
+cannot-lock-quick: '&6[LockettePro]&c這個方塊無法上鎖'
+cannot-add-additional-sign-quick: '&6[LockettePro]&c無法在這裡新增告示牌'
+locked-manual: '&6[LockettePro]&a已成功上鎖'
+additional-sign-added-manual: '&6[LockettePro]&a更多的使用者告示牌已新增'
+cannot-lock-manual: '&6[LockettePro]&c這個方塊無法上鎖'
+cannot-add-additional-sign-manual: '&6[LockettePro]&c無法在這裡新增告示牌'
+not-locked-yet-manual: '&6[LockettePro]&c這個方塊還沒有上鎖'
+cannot-lock-door-nearby-manual: '&6[LockettePro]&c這附近已經有其他人上鎖的門'
+block-already-locked-manual: '&6[LockettePro]&c這個方塊已經被上鎖了'
+block-is-not-lockable: '&6[LockettePro]&c這個方塊無法上鎖'
+sign-selected: '&6[LockettePro]&a您選擇了一個告示牌，輸入/lock 行號 玩家名稱 來修改它'
+break-own-lock-sign: '&6[LockettePro]&a上鎖的告示牌已拆除'
+cannot-break-this-lock-sign: '&6[LockettePro]&c無法拆除其他玩家上鎖的告示牌'
+break-own-additional-sign: '&6[LockettePro]&a更多使用者的告示牌已拆除'
+break-redundant-additional-sign: '&6[LockettePro]&a更多使用者的告示牌已拆除'
+cannot-break-this-additional-sign: '&6[LockettePro]&c無法拆除其他玩家上鎖的告示牌'
+block-is-locked: '&6[LockettePro]&c這個方塊已被上鎖'
+cannot-interfere-with-others: '&6[LockettePro]&c無法在已上鎖的方塊附近放置其他物件'
+sign-error: '&4[ERROR]'

src/me/crafter/mc/lockettepro/BlockEnvironmentListener.java

@@ -22,7 +22,7 @@ public class BlockEnvironmentListener implements Listener{
 	// Prevent explosion break block
 	@EventHandler(priority = EventPriority.HIGH)
 	public void onEntityExplode(EntityExplodeEvent event){
-		if (Config.isProtectionExempted("explosion")) return;
+ 		if (Config.isProtectionExempted("explosion")) return;
 		Iterator<Block> it = event.blockList().iterator();
         while (it.hasNext()) {
             Block block = it.next();
@@ -56,7 +56,7 @@ public void onStructureGrow(StructureGrowEvent event){
 	// Prevent piston extend break lock
 	@EventHandler(priority = EventPriority.HIGH)
 	public void onPistonExtend(BlockPistonExtendEvent event){
-		if (Config.isProtectionExempted("piston")) return;
+ 		if (Config.isProtectionExempted("piston")) return;
 		for (Block block : event.getBlocks()){
 			if (LocketteProAPI.isProtected(block)){
 				event.setCancelled(true);
@@ -89,7 +89,7 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event){
 	// Prevent villager open door
 	@EventHandler(priority = EventPriority.HIGH)
 	public void onVillagerOpenDoor(EntityInteractEvent event){
-		if (Config.isProtectionExempted("villager")) return;
+ 		if (Config.isProtectionExempted("villager")) return;
 		// Explicitly to villager vs all doors
 		if (event.getEntity() instanceof Villager &&
 				(LocketteProAPI.isSingleDoorBlock(event.getBlock()) || LocketteProAPI.isDoubleDoorBlock(event.getBlock())) && 

src/me/crafter/mc/lockettepro/BlockPlayerListener.java

@@ -23,11 +23,12 @@
 public class BlockPlayerListener implements Listener {
 
 	// Quick protect for chests
-	@EventHandler(priority = EventPriority.NORMAL)
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onPlayerQuickLockChest(PlayerInteractEvent event){
-		if (event.isCancelled()) return;
 		// Check quick lock enabled
 		if (Config.getQuickProtectAction() == (byte)0) return;
+		// Check world enabled
+		if (Config.isDisabledWorld(event.getPlayer().getWorld().getName())) return;
 		// Get player and action info
 		Action action = event.getAction();
 		Player player = event.getPlayer();
@@ -165,7 +166,7 @@ public void onManualLock(SignChangeEvent event){
 	}
 
 	// Player select sign
-	@EventHandler(priority = EventPriority.LOW)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void playerSelectSign(PlayerInteractEvent event){
 		if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.WALL_SIGN){
 			Block block = event.getClickedBlock();
@@ -180,9 +181,8 @@ public void playerSelectSign(PlayerInteractEvent event){
 	}
 
 	// Player break sign
-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onAttemptBreakSign(BlockBreakEvent event){
-		if (event.isCancelled()) return;
 		Block block = event.getBlock();
 		Player player = event.getPlayer();
 		if (player.hasPermission("lockettepro.admin.break")) return;
@@ -214,9 +214,8 @@ public void onAttemptBreakSign(BlockBreakEvent event){
 	}
 
 	// Protect block from being destroyed
-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onAttemptBreakLockedBlocks(BlockBreakEvent event){
-		if (event.isCancelled()) return;
 		Block block = event.getBlock();
 		Player player = event.getPlayer();
 		if (LocketteProAPI.isLocked(block) || LocketteProAPI.isUpDownLockedDoor(block)){
@@ -285,9 +284,8 @@ public void onAttemptInteractLockedBlocks(PlayerInteractEvent event){
 	}
 
 	// Protect block from interfere block
-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onAttemptPlaceInterfereBlocks(BlockPlaceEvent event){
-		if (event.isCancelled()) return;
 		Block block = event.getBlock();
 		Player player = event.getPlayer();
 		if (player.hasPermission("lockettepro.admin.interfere")) return;
@@ -299,9 +297,8 @@ public void onAttemptPlaceInterfereBlocks(BlockPlaceEvent event){
 	}
 
 	// Tell player about lockettepro
-	@EventHandler(priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onPlaceFirstBlockNotify(BlockPlaceEvent event){
-		if (event.isCancelled()) return;
 		Block block = event.getBlock();
 		Player player = event.getPlayer();
 		if (!player.hasPermission("lockettepro.lock")) return;

src/me/crafter/mc/lockettepro/Config.java

@@ -39,6 +39,7 @@ public class Config {
 	private static long lockdefaultcreatetime = -1L;
 	private static String lockexpirestring = "";
 	private static Set<String> protectionexempt = new HashSet<String>();
+	private static Set<String> disableWorlds = new HashSet<String>();
 
 	public Config(Plugin _plugin){
 		plugin = _plugin;
@@ -76,10 +77,12 @@ public static void reload(){
 		List<String> additionalstringlist = config.getStringList("additional-signs");
 		List<String> everyonestringlist = config.getStringList("everyone-signs");
 		List<String> protectionexemptstringlist = config.getStringList("protection-exempt");
+		List<String> disableworldsstringlist = config.getStringList("disable-worlds");
 		privatestrings = new HashSet<String>(privatestringlist);
 		additionalstrings = new HashSet<String>(additionalstringlist);
 		everyonestrings = new HashSet<String>(everyonestringlist);
 		protectionexempt = new HashSet<String>(protectionexemptstringlist);
+		disableWorlds = new HashSet<String>(disableworldsstringlist);
 		defaultprivatestring = privatestringlist.get(0);
 		defaultadditionalstring = additionalstringlist.get(0);
 
@@ -199,7 +202,7 @@ public static void initDefaultConfig(){
 	}
 
 	public static void initAdditionalFiles(){
-		String[] availablefiles = {"lang.yml", "lang_zh-cn.yml", "lang_es.yml", "lang_it.yml"};
+		String[] availablefiles = {"lang.yml", "lang_zh-cn.yml", "lang_zh-tw.yml", "lang_es.yml", "lang_it.yml"};
 		for (String filename : availablefiles){
 			File langfile = new File(plugin.getDataFolder(), filename);
 			if (!langfile.exists()){
@@ -287,4 +290,8 @@ public static boolean isProtectionExempted(String against){
 		return protectionexempt.contains(against);
 	}
 
+	public static boolean isDisabledWorld(String worldName){
+		return disableWorlds.contains(worldName);
+	}
+	
 }

src/me/crafter/mc/lockettepro/LocketteProAPI.java

@@ -17,6 +17,8 @@ public class LocketteProAPI {
 
 	public static boolean isLocked(Block block){
 		if (block == null) return false;
+		// World check
+		if (Config.isDisabledWorld(block.getWorld().getName())) return false;
 		switch (block.getType()){
 		// Double Doors
 		case WOODEN_DOOR:
@@ -208,6 +210,8 @@ public static boolean isOwnerOfSign(Block block, Player player){ // Requires isS
 	}
 
 	public static boolean isLockable(Block block){
+		// World check
+		if (block != null && Config.isDisabledWorld(block.getWorld().getName())) return false;
 		Material material = block.getType();
 		//Bad blocks
 		switch (material){