PandacubeFr/ChairsReloaded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix casting error.

Browse Source
This commit is contained in:
cnaude 2013-07-01 21:19:29 -07:00
parent e659eca5be
commit 4cc71ae667
1 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/com/cnaude/chairs/EventListener.java
View File

@ -53,24 +53,24 @@ public class EventListener implements Listener {
} }
} }
} }
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
delayedSitTask(); delayedSitTask();
} }
@EventHandler @EventHandler
public void onPlayerTeleport(PlayerTeleportEvent event) { public void onPlayerTeleport(PlayerTeleportEvent event) {
delayedSitTask(); delayedSitTask();
} }
private void delayedSitTask() { private void delayedSitTask() {
plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() { plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
plugin.sendSit(); plugin.sendSit();
} }
}, 20 ); }, 20);
} }
@EventHandler @EventHandler
@ -101,11 +101,11 @@ public class EventListener implements Listener {
standList.clear(); standList.clear();
} }
} }
public boolean isValidChair(Block block) { public boolean isValidChair(Block block) {
for (ChairBlock cb : plugin.allowedBlocks) { for (ChairBlock cb : plugin.allowedBlocks) {
if (cb.getMat().equals(block.getType())) { if (cb.getMat().equals(block.getType())) {
return true; return true;
} }
} }
return false; return false;
@ -113,20 +113,20 @@ public class EventListener implements Listener {
@EventHandler @EventHandler
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
if (event.getPlayer().getItemInHand().getType().isBlock() if (event.getPlayer().getItemInHand().getType().isBlock()
&& (event.getPlayer().getItemInHand().getTypeId() != 0) && (event.getPlayer().getItemInHand().getTypeId() != 0)
&& plugin.ignoreIfBlockInHand) { && plugin.ignoreIfBlockInHand) {
return; return;
} }
if (event.hasBlock() && event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.hasBlock() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
Stairs stairs = null; Stairs stairs = null;
Step step = null; Step step = null;
WoodenStep wStep = null; WoodenStep wStep = null;
double sh = plugin.sittingHeight; double sh = plugin.sittingHeight;
boolean blockOkay = false; boolean blockOkay = false;
Player player = event.getPlayer(); Player player = event.getPlayer();
if (ignoreList.isIgnored(player.getName())) { if (ignoreList.isIgnored(player.getName())) {
return; return;
@ -149,11 +149,11 @@ public class EventListener implements Listener {
PermissionDefault.FALSE)); PermissionDefault.FALSE));
} }
} }
for (ChairBlock cb : plugin.allowedBlocks) { for (ChairBlock cb : plugin.allowedBlocks) {
//plugin.logInfo("Comparing: (" + cb.getMat().name() + " ? " + block.getType().name() + ") (" //plugin.logInfo("Comparing: (" + cb.getMat().name() + " ? " + block.getType().name() + ") ("
// + cb.getDamage() + " ? " + block.getData() + ")"); // + cb.getDamage() + " ? " + block.getData() + ")");
if (cb.getMat().equals(block.getType()) if (cb.getMat().equals(block.getType())
&& cb.getDamage() == block.getData()) { && cb.getDamage() == block.getData()) {
blockOkay = true; blockOkay = true;
sh = cb.getSitHeight(); sh = cb.getSitHeight();
@ -165,7 +165,7 @@ public class EventListener implements Listener {
|| (player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) && plugin.perItemPerms) || (player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) && plugin.perItemPerms)
|| (player.hasPermission("chairs.sit." + block.getTypeId()) && plugin.perItemPerms) || (player.hasPermission("chairs.sit." + block.getTypeId()) && plugin.perItemPerms)
|| (player.hasPermission("chairs.sit." + block.getType().toString()) && plugin.perItemPerms)) { || (player.hasPermission("chairs.sit." + block.getType().toString()) && plugin.perItemPerms)) {
if (block.getState().getData() instanceof Stairs) { if (block.getState().getData() instanceof Stairs) {
stairs = (Stairs) block.getState().getData(); stairs = (Stairs) block.getState().getData();
//plugin.logInfo("STAIR"); //plugin.logInfo("STAIR");
@ -185,11 +185,11 @@ public class EventListener implements Listener {
// Check if block beneath chair is solid. // Check if block beneath chair is solid.
if (block.getRelative(BlockFace.DOWN).isLiquid()) { if (block.getRelative(BlockFace.DOWN).isLiquid()) {
return; return;
} }
if (block.getRelative(BlockFace.DOWN).isEmpty()) { if (block.getRelative(BlockFace.DOWN).isEmpty()) {
return; return;
} }
if (!block.getRelative(BlockFace.DOWN).getType().isSolid()) { if (!block.getRelative(BlockFace.DOWN).getType().isSolid()) {
return; return;
} }
@ -251,7 +251,7 @@ public class EventListener implements Listener {
} else if (stairs.getDescendingDirection() == BlockFace.EAST || stairs.getDescendingDirection() == BlockFace.WEST) { } else if (stairs.getDescendingDirection() == BlockFace.EAST || stairs.getDescendingDirection() == BlockFace.WEST) {
chairwidth += getChairWidth(block, BlockFace.NORTH); chairwidth += getChairWidth(block, BlockFace.NORTH);
chairwidth += getChairWidth(block, BlockFace.SOUTH); chairwidth += getChairWidth(block, BlockFace.SOUTH);
} }
if (chairwidth > plugin.maxChairWidth) { if (chairwidth > plugin.maxChairWidth) {
return; return;
@ -306,7 +306,7 @@ public class EventListener implements Listener {
} }
plugin.sit.put(player.getName(), block.getLocation()); plugin.sit.put(player.getName(), block.getLocation());
event.setUseInteractedBlock(Result.DENY); event.setUseInteractedBlock(Result.DENY);
delayedSitTask(); delayedSitTask();
} }
} }
@ -319,7 +319,7 @@ public class EventListener implements Listener {
// Go through the blocks next to the clicked block and check if there are any further stairs. // Go through the blocks next to the clicked block and check if there are any further stairs.
for (int i = 1; i <= plugin.maxChairWidth; i++) { for (int i = 1; i <= plugin.maxChairWidth; i++) {
Block relative = block.getRelative(face, i); Block relative = block.getRelative(face, i);
if (relative.getState().getData() instanceof Stairs) { if (relative.getState().getData() instanceof Stairs) {
if (isValidChair(relative) && ((Stairs) relative.getState().getData()).getDescendingDirection() == ((Stairs) block.getState().getData()).getDescendingDirection()) { if (isValidChair(relative) && ((Stairs) relative.getState().getData()).getDescendingDirection() == ((Stairs) block.getState().getData()).getDescendingDirection()) {
width++; width++;
} else { } else {
@ -334,46 +334,56 @@ public class EventListener implements Listener {
private boolean checkSign(Block block, BlockFace face) { private boolean checkSign(Block block, BlockFace face) {
// Go through the blocks next to the clicked block and check if are signs on the end. // Go through the blocks next to the clicked block and check if are signs on the end.
for (int i = 1; i <= 100; i++) { for (int i = 1; i <= 100; i++) {
Block relative = block.getRelative(face, i); Block relative = block.getRelative(face, i);
if (!isValidChair(relative) || (block.getState().getData() instanceof Stairs if (checkDirection(block, relative)) {
&& ((Stairs) relative.getState().getData()).getDescendingDirection() continue;
!= ((Stairs) block.getState().getData()).getDescendingDirection())) { }
if (plugin.validSigns.contains(relative.getType())) { if (plugin.validSigns.contains(relative.getType())) {
return true; return true;
} else { } else {
return false; return false;
}
} }
} }
return false; return false;
} }
private boolean checkDirection(Block block1, Block block2) {
if (block1.getState().getData() instanceof Stairs
&& block2.getState().getData() instanceof Stairs) {
if (((Stairs) block1.getState().getData()).getDescendingDirection()
.equals(((Stairs) block2.getState().getData()).getDescendingDirection())) {
return true;
}
}
return false;
}
private boolean checkFrame(Block block, BlockFace face, Player player) { private boolean checkFrame(Block block, BlockFace face, Player player) {
// Go through the blocks next to the clicked block and check if are signs on the end. // Go through the blocks next to the clicked block and check if are signs on the end.
for (int i = 1; i <= 100; i++) { for (int i = 1; i <= 100; i++) {
Block relative = block.getRelative(face, i); Block relative = block.getRelative(face, i);
int x = relative.getLocation().getBlockX(); if (checkDirection(block, relative)) {
int y = relative.getLocation().getBlockY(); continue;
int z = relative.getLocation().getBlockZ(); }
if (!isValidChair(relative) || (block.getState().getData() instanceof Stairs if (relative.getType().equals(Material.AIR)) {
&& ((Stairs) relative.getState().getData()).getDescendingDirection() int x = relative.getLocation().getBlockX();
!= ((Stairs) block.getState().getData()).getDescendingDirection())) { int y = relative.getLocation().getBlockY();
if (relative.getType().equals(Material.AIR)) { int z = relative.getLocation().getBlockZ();
for (Entity e : player.getNearbyEntities(plugin.distance, plugin.distance, plugin.distance)) { for (Entity e : player.getNearbyEntities(plugin.distance, plugin.distance, plugin.distance)) {
if (e instanceof ItemFrame && plugin.validSigns.contains(Material.ITEM_FRAME)) { if (e instanceof ItemFrame && plugin.validSigns.contains(Material.ITEM_FRAME)) {
int x2 = e.getLocation().getBlockX(); int x2 = e.getLocation().getBlockX();
int y2 = e.getLocation().getBlockY(); int y2 = e.getLocation().getBlockY();
int z2 = e.getLocation().getBlockZ(); int z2 = e.getLocation().getBlockZ();
if (x == x2 && y == y2 && z == z2) { if (x == x2 && y == y2 && z == z2) {
return true; return true;
}
} }
} }
} else {
return false;
} }
} return false;
} else {
return false;
}
} }
return false; return false;
} }