amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Use custom method to get blocks in sight

Browse Source
This commit is contained in:
Eric 2017-05-06 16:13:59 +02:00
parent f95122daaa
commit 02275103c0
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/de/epiceric/shopchest/utils/ShopUtils.java
View File

@ -13,12 +13,13 @@ import org.bukkit.block.DoubleChest;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.util.Vector;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.Set;
public class ShopUtils { public class ShopUtils {
@ -252,18 +253,7 @@ public class ShopUtils {
} }
if (plugin.getShopChestConfig().only_show_shops_in_sight) { if (plugin.getShopChestConfig().only_show_shops_in_sight) {
HashSet<Material> transparent = new HashSet<>(); Set<Block> sight = getBlocksInSight(player);
transparent.add(Material.AIR);
List<Block> sight;
try {
sight = player.getLineOfSight(transparent, (int) plugin.getShopChestConfig().maximal_distance);
} catch (IllegalStateException e) {
// This method is occasionally throwing this exception but the exact reason is unknown...
plugin.debug("Failed to get line of sight: " + e.getMessage());
return;
}
ArrayList<Shop> shopsInSight = new ArrayList<>(); ArrayList<Shop> shopsInSight = new ArrayList<>();
@ -320,6 +310,28 @@ public class ShopUtils {
playerLocation.put(player, player.getLocation()); playerLocation.put(player, player.getLocation());
} }
private Set<Block> getBlocksInSight(Player player) {
double dist = plugin.getShopChestConfig().maximal_distance;
Location loc = player.getEyeLocation();
Vector direction = loc.getDirection();
Set<Block> blocks = new HashSet<>();
blocks.add(loc.getBlock());
double i = 0;
do {
blocks.add(loc.add(direction).getBlock());
i++;
} while (i < dist - (dist%1));
direction.multiply(dist - (dist%1));
blocks.add(loc.add(direction).getBlock());
return blocks;
}
/** /**
* Update hologram and item of the shop for a player based on their distance to each other * Update hologram and item of the shop for a player based on their distance to each other
* @param shop Shop to update * @param shop Shop to update