EpicKnarvik97/ItemCase
EpicKnarvik97/ItemCase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better support full block itemcases.

Browse Source
This commit is contained in:
Jesse Prescott 2018-06-06 06:17:59 +01:00
parent fa9367ba18
commit 20378009f5
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/gmail/bleedobsidian/itemcase/Itemcase.java
View File

@ -475,12 +475,31 @@ public final class Itemcase {
*/ */
public Location getDisplayItemSpawnLocation() { public Location getDisplayItemSpawnLocation() {
// Get block type of this itemcase.
Material type = this.location.getBlock().getType();
// The relative Y coordinate.
double relY = 0;
// If block is a slab.
if(type == Material.STEP ||
type == Material.WOOD_STEP ||
type == Material.PURPUR_SLAB) {
// Set relY.
relY = 0.6;
} else {
// Set relY.
relY = 1.6;
}
// Create a location that is in the centre of the block and slightly // Create a location that is in the centre of the block and slightly
// above. // above.
Location displayItemLocation = new Location( Location displayItemLocation = new Location(
this.location.getWorld(), this.location.getWorld(),
this.location.getBlockX() + 0.5, this.location.getBlockX() + 0.5,
this.location.getBlockY() + 1.5, this.location.getBlockY() + relY,
this.location.getBlockZ() + 0.5); this.location.getBlockZ() + 0.5);
// Return the default location to spawn the display item. // Return the default location to spawn the display item.
@ -544,12 +563,29 @@ public final class Itemcase {
// For every Itemcase. // For every Itemcase.
for(Itemcase itemcase : itemcaseManager.getItemcases()) { for(Itemcase itemcase : itemcaseManager.getItemcases()) {
// Get block type.
Material type = itemcase.getLocation().getBlock().getType();
// Check if the block placed was on an itemcase. // Check if the block placed was on an itemcase.
if(itemcase.location.equals(event.getBlock().getLocation())) { if(itemcase.location.equals(event.getBlock().getLocation())) {
// Cancel the event. // Cancel the event.
event.setCancelled(true); event.setCancelled(true);
} }
// If not a slab.
if(type != Material.STEP &&
type != Material.WOOD_STEP &&
type != Material.PURPUR_SLAB) {
// Check if the block placed was 1 above an itemcase.
if(itemcase.location.clone().add(0, 1, 0)
.equals(event.getBlock().getLocation())) {
// Cancel the event.
event.setCancelled(true);
}
}
} }
} }
@ -741,7 +777,7 @@ public final class Itemcase {
// Check if the display item has for some reason moved. // Check if the display item has for some reason moved.
if(x != displayItemSpawnLocation.getX() || if(x != displayItemSpawnLocation.getX() ||
y != displayItemSpawnLocation.getBlockY() - 1 || y != displayItemSpawnLocation.getBlockY() ||
z != displayItemSpawnLocation.getZ()) { z != displayItemSpawnLocation.getZ()) {
// Move the display item back to where it should be. // Move the display item back to where it should be.