Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-02-17 10:41:26 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Acrobot 2012-06-25 17:16:57 +02:00
parent 9ef6305a0a
commit 5fd4034c45
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com/Acrobot/ChestShop/DB/Queue.java
View File

@ -5,15 +5,14 @@ import com.Acrobot.ChestShop.Config.Config;
import com.Acrobot.ChestShop.Config.Property; import com.Acrobot.ChestShop.Config.Property;
import javax.persistence.OptimisticLockException; import javax.persistence.OptimisticLockException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
/** /**
* @author Acrobot * @author Acrobot
*/ */
public class Queue implements Runnable { public class Queue implements Runnable {
private static final List<Transaction> queue = Collections.synchronizedList(new ArrayList<Transaction>()); private static final ConcurrentLinkedQueue<Transaction> queue = new ConcurrentLinkedQueue<Transaction>();
public static void addToQueue(Transaction t) { public static void addToQueue(Transaction t) {
queue.add(t); queue.add(t);

25
com/Acrobot/ChestShop/Listeners/Block/BlockPlace.java
View File

@ -3,6 +3,7 @@ package com.Acrobot.ChestShop.Listeners.Block;
import com.Acrobot.Breeze.Utils.BlockUtil; import com.Acrobot.Breeze.Utils.BlockUtil;
import com.Acrobot.ChestShop.Config.Config; import com.Acrobot.ChestShop.Config.Config;
import com.Acrobot.ChestShop.Config.Language; import com.Acrobot.ChestShop.Config.Language;
import com.Acrobot.ChestShop.Permission;
import com.Acrobot.ChestShop.Security; import com.Acrobot.ChestShop.Security;
import com.Acrobot.ChestShop.Signs.ChestShopSign; import com.Acrobot.ChestShop.Signs.ChestShopSign;
import com.Acrobot.ChestShop.Utils.uBlock; import com.Acrobot.ChestShop.Utils.uBlock;
@ -10,6 +11,7 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
@ -29,17 +31,32 @@ public class BlockPlace implements Listener {
Block placed = event.getBlockPlaced(); Block placed = event.getBlockPlaced();
if (placed.getType() == Material.CHEST) { if (placed.getType() != Material.CHEST) {
return;
}
Player player = event.getPlayer();
if (Permission.has(player, Permission.ADMIN)) {
return;
}
if (!Security.canAccess(player, placed)) {
event.getPlayer().sendMessage(Config.getLocal(Language.ACCESS_DENIED));
event.setCancelled(true);
}
Chest neighbor = uBlock.findNeighbor(placed); Chest neighbor = uBlock.findNeighbor(placed);
if (neighbor == null) { if (neighbor == null) {
return; return;
} }
Block neighborBlock = neighbor.getBlock(); if (!Security.canAccess(event.getPlayer(), neighbor.getBlock())) {
if (!Security.canAccess(event.getPlayer(), neighborBlock)) {
event.getPlayer().sendMessage(Config.getLocal(Language.ACCESS_DENIED)); event.getPlayer().sendMessage(Config.getLocal(Language.ACCESS_DENIED));
event.setCancelled(true); event.setCancelled(true);
} }
}
} }
} }

2
plugin.yml
View File

@ -2,7 +2,7 @@ name: ChestShop
main: com.Acrobot.ChestShop.ChestShop main: com.Acrobot.ChestShop.ChestShop
version: 3.44 TEST BUILD version: 3.45 TEST BUILD
#for CButD #for CButD
dev-url: http://dev.bukkit.org/server-mods/chestshop/ dev-url: http://dev.bukkit.org/server-mods/chestshop/