Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fixed a bug with admin placed signs

This commit is contained in:
Acrobot 2011-09-09 15:15:53 +02:00
parent a84c68d49d
commit 9a914929d1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
com/Acrobot/ChestShop/ChestShop.java
View File

@ -13,6 +13,7 @@ import com.Acrobot.ChestShop.Logging.FileWriterQueue;
import com.Acrobot.ChestShop.Protection.MaskChest;
import com.avaje.ebean.EbeanServer;
import com.lennardf1989.bukkitex.Database;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.event.Event;
import org.bukkit.event.Listener;

6
com/Acrobot/ChestShop/Listeners/blockBreak.java
View File

@ -22,10 +22,10 @@ public class blockBreak extends BlockListener {
if (uSign.isSign(block)) block.getState().update();
Sign sign = uBlock.findRestrictedSign(block);
if (sign != null && isCorrectSign(sign, block)) return true;
if (isCorrectSign(sign, block)) return true;
sign = uBlock.findSign(block);
return sign != null && (isCorrectSign(sign, block) && playerIsNotOwner(player, sign));
return isCorrectSign(sign, block) && playerIsNotOwner(player, sign);
}
public void onBlockBreak(BlockBreakEvent event) {
@ -33,7 +33,7 @@ public class blockBreak extends BlockListener {
}
private static boolean isCorrectSign(Sign sign, Block block) {
return sign.getBlock() == block || getAttachedFace(sign) == block;
return sign != null && sign.getBlock() == block || getAttachedFace(sign) == block;
}
private static Block getAttachedFace(Sign sign) {

2
com/Acrobot/ChestShop/Utils/uBlock.java
View File

@ -13,7 +13,7 @@ import org.bukkit.block.Sign;
public class uBlock {
private static final BlockFace[] chestFaces = {BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
private static final BlockFace[] shopFaces = {BlockFace.DOWN, BlockFace.UP, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH, BlockFace.SELF};
private static final BlockFace[] shopFaces = {BlockFace.SELF, BlockFace.DOWN, BlockFace.UP, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
public static Chest findChest(Sign sign) {
Block block = sign.getBlock();

2
plugin.yml
View File

@ -2,7 +2,7 @@ name: ChestShop
main: com.Acrobot.ChestShop.ChestShop
version: 3.1
version: 3.11
author: Acrobot