Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-26 04:05:56 +01:00
Code Issues Projects Releases Wiki Activity

fix for left-clicking wooden doors not being prevented; as a minor side-effect, left-clicking on other blocks in the territoryProtectedMaterials list pops up the "you can't use that" message

Browse Source 
Releasing 1.1.5 for this quick fix
This commit is contained in:
Brettflan 2011-04-04 08:34:32 -05:00
parent 1f77dbedde
commit 204f67c43b
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -1,5 +1,5 @@
name: Factions
version: 1.1.4
version: 1.1.5
main: com.bukkit.mcteam.factions.Factions
commands:
f:

BIN
releases/factions 1.1.5.zip Normal file
View File

Binary file not shown.

16
src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java
View File

@ -138,17 +138,23 @@ public class FactionsPlayerListener extends PlayerListener{
if (event.isCancelled()) {
return;
}
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
return; // only interested on right-clicks on blocks, whether player is using an item or interacting with a block
}
Block block = event.getClickedBlock();
Player player = event.getPlayer();
if ( ! canPlayerUseRightclickBlock(player, block)) {
if (block == null) {
return; // clicked in air, apparently
}
if ( ! canPlayerUseBlock(player, block)) {
event.setCancelled(true);
return;
}
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
return; // only interested on right-clicks for below
}
// this check below might no longer be needed... bucket detection is now necessarily handled separately in onPlayerBucketXXX() events, and
// Flint&Steel is somehow detected before this in onBlockPlace(), and that's currently it for the default territoryDenyUseageMaterials
if ( ! this.playerCanUseItemHere(player, block, event.getMaterial())) {
@ -194,7 +200,7 @@ public class FactionsPlayerListener extends PlayerListener{
return true;
}
public boolean canPlayerUseRightclickBlock(Player player, Block block) {
public boolean canPlayerUseBlock(Player player, Block block) {
if (Factions.hasPermAdminBypass(player)) {
return true;