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

FIx double chests when facing south or west

Browse Source
This commit is contained in:
Eric 2018-07-23 21:32:42 +02:00
parent 43bb3e3b38
commit 372124b04e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/de/epiceric/shopchest/shop/Shop.java
View File

@ -18,6 +18,7 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest; import org.bukkit.block.DoubleChest;
import org.bukkit.block.data.Directional;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -166,6 +167,7 @@ public class Shop {
Chest[] chests = new Chest[2]; Chest[] chests = new Chest[2];
boolean doubleChest; boolean doubleChest;
BlockFace face;
if (ih instanceof DoubleChest) { if (ih instanceof DoubleChest) {
DoubleChest dc = (DoubleChest) ih; DoubleChest dc = (DoubleChest) ih;
@ -180,8 +182,10 @@ public class Shop {
doubleChest = false; doubleChest = false;
} }
face = ((Directional) chests[0].getBlockData()).getFacing();
String[] holoText = getHologramText(); String[] holoText = getHologramText();
Location holoLocation = getHologramLocation(doubleChest, chests); Location holoLocation = getHologramLocation(doubleChest, chests, face);
hologram = new Hologram(plugin, holoText, holoLocation); hologram = new Hologram(plugin, holoText, holoLocation);
} }
@ -270,7 +274,7 @@ public class Shop {
return lines.toArray(new String[0]); return lines.toArray(new String[0]);
} }
private Location getHologramLocation(boolean doubleChest, Chest[] chests) { private Location getHologramLocation(boolean doubleChest, Chest[] chests, BlockFace face) {
Block b = location.getBlock(); Block b = location.getBlock();
Location holoLocation; Location holoLocation;
@ -284,21 +288,21 @@ public class Shop {
if (Config.hologramFixedBottom) subtractY = 0.85; if (Config.hologramFixedBottom) subtractY = 0.85;
if (doubleChest) { if (doubleChest) {
Chest r = chests[0]; Chest c1 = face == BlockFace.NORTH || face == BlockFace.EAST ? chests[1] : chests[0];
Chest l = chests[1]; Chest c2 = face == BlockFace.NORTH || face == BlockFace.EAST ? chests[0] : chests[1];
if (b.getLocation().equals(l.getLocation())) { if (b.getLocation().equals(c1.getLocation())) {
if (r.getX() != l.getX()) { if (c1.getX() != c2.getX()) {
holoLocation = new Location(w, x, y - subtractY, z + 0.5); holoLocation = new Location(w, x, y - subtractY, z + 0.5);
} else if (r.getZ() != l.getZ()) { } else if (c1.getZ() != c2.getZ()) {
holoLocation = new Location(w, x + 0.5, y - subtractY, z); holoLocation = new Location(w, x + 0.5, y - subtractY, z);
} else { } else {
holoLocation = new Location(w, x + 0.5, y - subtractY, z + 0.5); holoLocation = new Location(w, x + 0.5, y - subtractY, z + 0.5);
} }
} else { } else {
if (r.getX() != l.getX()) { if (c1.getX() != c2.getX()) {
holoLocation = new Location(w, x + 1, y - subtractY, z + 0.5); holoLocation = new Location(w, x + 1, y - subtractY, z + 0.5);
} else if (r.getZ() != l.getZ()) { } else if (c1.getZ() != c2.getZ()) {
holoLocation = new Location(w, x + 0.5, y - subtractY, z + 1); holoLocation = new Location(w, x + 0.5, y - subtractY, z + 1);
} else { } else {
holoLocation = new Location(w, x + 0.5, y - subtractY, z + 0.5); holoLocation = new Location(w, x + 0.5, y - subtractY, z + 0.5);