mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Merge branch 'master' of https://github.com/Vazkii/Botania
This commit is contained in:
commit
978a25328f
3 files changed
+9
-2
No files matched your search
@@ -39,6 +39,11 @@ public class BlockModWall extends BlockWall implements ILexiconable {
|
||||
setBlockName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canPlaceTorchOnTop(World world, int x, int y, int z) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block setBlockName(String par1Str) {
|
||||
register(par1Str);
|
||||
|
||||
@@ -97,7 +97,9 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi
|
||||
int meta = par1World.getBlockMetadata(par2, par3, par4);
|
||||
|
||||
if(lens == null && isHeldItemLens) {
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null);
|
||||
if(!par5EntityPlayer.capabilities.isCreativeMode)
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null);
|
||||
|
||||
prism.setInventorySlotContents(0, heldItem.copy());
|
||||
prism.markDirty();
|
||||
par1World.setBlockMetadataWithNotify(par2, par3, par4, meta | 1, 1 | 2);
|
||||
|
||||
@@ -77,7 +77,7 @@ public final class SkyblockWorldEvents {
|
||||
event.entityPlayer.swingItem();
|
||||
else {
|
||||
event.world.playSoundEffect(event.x + 0.5, event.y + 0.5, event.z + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getPitch() + (float) (Math.random() * 0.2 - 0.1));
|
||||
if(Math.random() < 0.4)
|
||||
if(Math.random() < 0.8)
|
||||
event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user