TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

EarthSmash & EarthBlast fixes (#516)

Browse source 
* Adds slabs to default earth lists, stops slabs from changing to stone when fired

* Fixes EarthSmash deleting sand / gravel blocks when riding EarthSmash into them
This commit is contained in:
Archie 2016-07-17 20:23:12 +01:00 committed by OmniCypher
parent 8b9d80d76a
commit 2c076b50da
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -354,6 +354,7 @@ public class ConfigManager {
earthBlocks.add("NETHERRACK"); earthBlocks.add("NETHERRACK");
earthBlocks.add("QUARTZ_ORE"); earthBlocks.add("QUARTZ_ORE");
earthBlocks.add("COBBLESTONE"); earthBlocks.add("COBBLESTONE");
earthBlocks.add("STEP");
ArrayList<String> metalBlocks = new ArrayList<String>(); ArrayList<String> metalBlocks = new ArrayList<String>();
metalBlocks.add("IRON_BLOCK"); metalBlocks.add("IRON_BLOCK");

6
src/com/projectkorra/projectkorra/earthbending/EarthBlast.java
View file

@ -107,7 +107,11 @@ public class EarthBlast extends EarthAbility {
sourceBlock.setType(Material.RED_SANDSTONE); sourceBlock.setType(Material.RED_SANDSTONE);
} else { } else {
sourceBlock.setType(Material.SANDSTONE); sourceBlock.setType(Material.SANDSTONE);
} }
} if (sourceBlock.getType() == Material.STEP) {
sourceBlock.setType(Material.STEP);
sourceType = Material.STEP;
} else if (sourceBlock.getType() == Material.STONE) { } else if (sourceBlock.getType() == Material.STONE) {
sourceBlock.setType(Material.COBBLESTONE); sourceBlock.setType(Material.COBBLESTONE);
sourceType = Material.STONE; sourceType = Material.STONE;

2
src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
View file

@ -399,7 +399,7 @@ public class EarthSmash extends EarthAbility {
for (BlockRepresenter blockRep : currentBlocks) { for (BlockRepresenter blockRep : currentBlocks) {
Block block = location.clone().add(blockRep.getX(), blockRep.getY(), blockRep.getZ()).getBlock(); Block block = location.clone().add(blockRep.getX(), blockRep.getY(), blockRep.getZ()).getBlock();
if (block.getType().equals(Material.SAND) || block.getType().equals(Material.GRAVEL)) { //Check if block can be affected by gravity. if (block.getType().equals(Material.SAND) || block.getType().equals(Material.GRAVEL)) { //Check if block can be affected by gravity.
addTempAirBlock(block); //If so, set it to a temp air block.
} }
if (player != null && isTransparent(block)) { if (player != null && isTransparent(block)) {
affectedBlocks.add(new TempBlock(block, blockRep.getType(), blockRep.getData())); affectedBlocks.add(new TempBlock(block, blockRep.getType(), blockRep.getData()));