Upstream/EpicFurnaces
1
0
Fork 0
mirror of https://github.com/songoda/EpicFurnaces.git synced 2025-01-05 23:37:34 +01:00
Code Issues Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
jascotty2 2019-09-10 19:57:12 -05:00
commit 09216ac604
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
View File

@ -172,7 +172,6 @@ public class Furnace {
}
private void syncName() {
if (!(location.getBlock() instanceof Furnace)) return;
org.bukkit.block.Furnace furnace = (org.bukkit.block.Furnace) location.getBlock().getState();
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_10))
furnace.setCustomName(Methods.formatName(level.getLevel(), uses, false));

13
src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java
View File

@ -76,20 +76,19 @@ public class FurnaceTask extends BukkitRunnable {
if (block.getType() == Material.AIR || block.getRelative(BlockFace.UP).getType() != Material.AIR) continue;
if (block.getType() == Material.SNOW)
block.setType(Material.AIR);
else if (block.getType() == Material.ICE || block.getType() == Material.PACKED_ICE)
block.setType(Material.WATER);
else
continue;
if (doParticles) {
float xx = (float) (0 + (Math.random() * .75));
float yy = (float) (0 + (Math.random() * 1));
float zz = (float) (0 + (Math.random() * .75));
CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.SMOKE_NORMAL, location, 25, xx, yy, zz, 0);
}
if (block.getType() == Material.SNOW) {
block.setType(Material.AIR);
} else if (block.getType() == Material.ICE || block.getType() == Material.PACKED_ICE) {
block.setType(Material.WATER);
}
}
}