From 3402efe5c769d8b04736e79c2b724e4180b00d8c Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Thu, 7 Apr 2016 21:37:50 -0700 Subject: [PATCH] Stop using deprecated getItemInHand() --- .../GriefPrevention/EquipShovelProcessingTask.java | 3 ++- src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EquipShovelProcessingTask.java b/src/me/ryanhamshire/GriefPrevention/EquipShovelProcessingTask.java index eec3f6c..0385505 100644 --- a/src/me/ryanhamshire/GriefPrevention/EquipShovelProcessingTask.java +++ b/src/me/ryanhamshire/GriefPrevention/EquipShovelProcessingTask.java @@ -19,6 +19,7 @@ package me.ryanhamshire.GriefPrevention; import org.bukkit.entity.Player; +import org.bukkit.inventory.EquipmentSlot; //tells a player about how many claim blocks he has, etc //implemented as a task so that it can be delayed @@ -37,7 +38,7 @@ class EquipShovelProcessingTask implements Runnable public void run() { //if he's not holding the golden shovel anymore, do nothing - if(player.getItemInHand().getType() != GriefPrevention.instance.config_claims_modificationTool) return; + if(GriefPrevention.instance.getItemInHand(player, EquipmentSlot.HAND).getType() != GriefPrevention.instance.config_claims_modificationTool) return; PlayerData playerData = GriefPrevention.instance.dataStore.getPlayerData(player.getUniqueId()); diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 70a928f..3844da0 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -64,6 +64,7 @@ import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.MetadataValue; @@ -1405,7 +1406,7 @@ class PlayerEventHandler implements Listener if(!GriefPrevention.instance.pvpRulesApply(player.getWorld())) return; //if we're preventing spawn camping and the player was previously empty handed... - if(GriefPrevention.instance.config_pvp_protectFreshSpawns && (player.getItemInHand().getType() == Material.AIR)) + if(GriefPrevention.instance.config_pvp_protectFreshSpawns && (GriefPrevention.instance.getItemInHand(player, EquipmentSlot.HAND).getType() == Material.AIR)) { //if that player is currently immune to pvp PlayerData playerData = this.dataStore.getPlayerData(event.getPlayer().getUniqueId());