First update to 1.9. Sadly makes it not work w/ 1.8

This commit is contained in:
graywolf336
2016-03-21 16:57:29 -05:00
parent 1618e17d63
commit 95b159c69d
8 changed files with 39 additions and 20 deletions

View File

@ -48,7 +48,7 @@ public class PlayerListener implements Listener {
Location loc = event.getClickedBlock() == null ? p.getLocation() : event.getClickedBlock().getLocation();
JailManager jm = pl.getJailManager();
if(p.getItemInHand().isSimilar(Util.getWand())) {
if(p.getInventory().getItemInMainHand().isSimilar(Util.getWand())) {
if(jm.isCreatingSomething(p.getName())) {
if(jm.isCreatingAJail(p.getName())) {
pl.debug("Stepping into creating a jail.");
@ -225,8 +225,8 @@ public class PlayerListener implements Listener {
Player player = (Player) event.getEntity();
if(pl.getJailStickManager().isUsingJailStick(attacker.getUniqueId())) {
if(pl.getJailStickManager().isValidStick(attacker.getItemInHand().getType())) {
if(attacker.hasPermission("jail.usejailstick." + attacker.getItemInHand().getType().toString().toLowerCase())) {
if(pl.getJailStickManager().isValidStick(attacker.getInventory().getItemInMainHand().getType())) {
if(attacker.hasPermission("jail.usejailstick." + attacker.getInventory().getItemInMainHand().getType().toString().toLowerCase())) {
//The person the attacker is trying to jail stick is already jailed, don't handle that
if(pl.getJailManager().isPlayerJailed(player.getUniqueId())) {
attacker.sendMessage(Lang.ALREADYJAILED.get(player.getName()));
@ -234,7 +234,7 @@ public class PlayerListener implements Listener {
if(player.hasPermission("jail.cantbejailed")) {
attacker.sendMessage(Lang.CANTBEJAILED.get());
}else {
Stick s = pl.getJailStickManager().getStick(attacker.getItemInHand().getType());
Stick s = pl.getJailStickManager().getStick(attacker.getInventory().getItemInMainHand().getType());
if(player.getHealth() <= s.getHealth() || s.getHealth() == -1) {
Prisoner p = new Prisoner(player.getUniqueId().toString(), player.getName(),

View File

@ -289,7 +289,7 @@ public class ProtectionListener implements Listener {
event.setCancelled(true);
}
}else if (event.getPlayer().getItemInHand() != null) {
}else if (event.getPlayer().getInventory().getItemInMainHand() != null) {
//Otherwise let's check if they have something in hand
//Get the interaction blacklist, check if the current item is in there
//if it is, then let's take action

View File

@ -37,8 +37,8 @@ public class CellCreationSteps {
if(player.getInventory().contains(wand)) {
int i = player.getInventory().first(wand);
if(i != -1) {
player.getInventory().setItem(i, player.getItemInHand());
player.setItemInHand(wand);
player.getInventory().setItem(i, player.getInventory().getItemInMainHand());
player.getInventory().setItemInMainHand(wand);
}
}else {
player.getInventory().addItem(wand);

View File

@ -30,8 +30,8 @@ public class JailCreationSteps {
if(player.getInventory().contains(wand)) {
int i = player.getInventory().first(wand);
if(i != -1) {
player.getInventory().setItem(i, player.getItemInHand());
player.setItemInHand(wand);
player.getInventory().setItem(i, player.getInventory().getItemInMainHand());
player.getInventory().setItemInMainHand(wand);
}
}else {
player.getInventory().addItem(wand);

View File

@ -6,6 +6,7 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.HumanEntity;
import org.bukkit.event.inventory.InventoryType;
@ -13,7 +14,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
public class MockPlayerInventory implements PlayerInventory {
private int armorSize = 4, inventorySize = 36;
ItemStack[] armorContents = new ItemStack[armorSize];
ItemStack[] inventoryContents = new ItemStack[inventorySize];
@ -294,8 +294,27 @@ public class MockPlayerInventory implements PlayerInventory {
+ ",\"armorContents\":" + makeMap(getArmorContents()) + "}";
}
@Override
public void setHeldItemSlot(int slot) {
}
}
public Location getLocation() {
return null;
}
public ItemStack getItemInMainHand() {
return null;
}
public ItemStack getItemInOffHand() {
return null;
}
public void setItemInMainHand(ItemStack item) {
}
public void setItemInOffHand(ItemStack item) {
}
}

View File

@ -30,7 +30,7 @@ import org.bukkit.WorldCreator;
import org.bukkit.WorldType;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemFactory;
import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemFactory;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.plugin.Plugin;