Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix.

Browse Source
This commit is contained in:
ryanhamshire 2016-03-20 13:50:49 -07:00
parent ed4f0bbc9a
commit 03a802365c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -55,6 +55,7 @@ import org.bukkit.command.*;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.PlayerInventory;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
@ -3402,4 +3403,10 @@ public class GriefPrevention extends JavaPlugin
} }
} }
} }
public ItemStack getItemInHand(Player player, EquipmentSlot hand)
{
if(hand == EquipmentSlot.OFF_HAND) return player.getInventory().getItemInOffHand();
return player.getInventory().getItemInMainHand();
}
} }

7
src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -1344,7 +1344,7 @@ class PlayerEventHandler implements Listener
} }
//if preventing theft, prevent leashing claimed creatures //if preventing theft, prevent leashing claimed creatures
if(GriefPrevention.instance.config_claims_preventTheft && entity instanceof Creature && player.getItemInHand().getType() == Material.LEASH) if(GriefPrevention.instance.config_claims_preventTheft && entity instanceof Creature && GriefPrevention.instance.getItemInHand(player, event.getHand()).getType() == Material.LEASH)
{ {
Claim claim = this.dataStore.getClaimAt(entity.getLocation(), false, playerData.lastClaim); Claim claim = this.dataStore.getClaimAt(entity.getLocation(), false, playerData.lastClaim);
if(claim != null) if(claim != null)
@ -1571,9 +1571,6 @@ class PlayerEventHandler implements Listener
if(action == Action.LEFT_CLICK_AIR) return; if(action == Action.LEFT_CLICK_AIR) return;
if(action == Action.PHYSICAL) return; if(action == Action.PHYSICAL) return;
//not interested in offhand clicks
if(event.getHand() == EquipmentSlot.OFF_HAND) return;
Player player = event.getPlayer(); Player player = event.getPlayer();
Block clickedBlock = event.getClickedBlock(); //null returned here means interacting with air Block clickedBlock = event.getClickedBlock(); //null returned here means interacting with air
@ -1786,7 +1783,7 @@ class PlayerEventHandler implements Listener
if(action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) return; if(action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) return;
//what's the player holding? //what's the player holding?
ItemStack itemInHand = player.getItemInHand(); ItemStack itemInHand = GriefPrevention.instance.getItemInHand(player, event.getHand());
Material materialInHand = itemInHand.getType(); Material materialInHand = itemInHand.getType();
//if it's bonemeal or armor stand or spawn egg, check for build permission (ink sac == bone meal, must be a Bukkit bug?) //if it's bonemeal or armor stand or spawn egg, check for build permission (ink sac == bone meal, must be a Bukkit bug?)