EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3185 from nathanprocks/master

Browse Source 
Add shaking from shulkers
This commit is contained in:
t00thpick1 2017-06-07 21:22:30 -04:00 committed by GitHub
commit fda625b235
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
View File

@ -61,6 +61,7 @@ public class TreasureConfig extends ConfigLoader {
public List<ShakeTreasure> shakeFromPigZombie = new ArrayList<ShakeTreasure>(); public List<ShakeTreasure> shakeFromPigZombie = new ArrayList<ShakeTreasure>();
public List<ShakeTreasure> shakeFromPlayer = new ArrayList<ShakeTreasure>(); public List<ShakeTreasure> shakeFromPlayer = new ArrayList<ShakeTreasure>();
public List<ShakeTreasure> shakeFromSheep = new ArrayList<ShakeTreasure>(); public List<ShakeTreasure> shakeFromSheep = new ArrayList<ShakeTreasure>();
public List<ShakeTreasure> shakeFromShulker = new ArrayList<ShakeTreasure>();
public List<ShakeTreasure> shakeFromSkeleton = new ArrayList<ShakeTreasure>(); public List<ShakeTreasure> shakeFromSkeleton = new ArrayList<ShakeTreasure>();
public List<ShakeTreasure> shakeFromSlime = new ArrayList<ShakeTreasure>(); public List<ShakeTreasure> shakeFromSlime = new ArrayList<ShakeTreasure>();
public List<ShakeTreasure> shakeFromSnowman = new ArrayList<ShakeTreasure>(); public List<ShakeTreasure> shakeFromSnowman = new ArrayList<ShakeTreasure>();
@ -355,6 +356,8 @@ public class TreasureConfig extends ConfigLoader {
shakeFromPlayer.add(shakeTreasure); shakeFromPlayer.add(shakeTreasure);
} else if (type.equals("Shake.SHEEP")) { } else if (type.equals("Shake.SHEEP")) {
shakeFromSheep.add(shakeTreasure); shakeFromSheep.add(shakeTreasure);
} else if (type.equals("Shake.SHULKER")) {
shakeFromShulker.add(shakeTreasure);
} else if (type.equals("Shake.SKELETON")) { } else if (type.equals("Shake.SKELETON")) {
shakeFromSkeleton.add(shakeTreasure); shakeFromSkeleton.add(shakeTreasure);
} else if (type.equals("Shake.SLIME")) { } else if (type.equals("Shake.SLIME")) {

3
src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
View File

@ -113,6 +113,9 @@ public final class Fishing {
case SHEEP: case SHEEP:
return TreasureConfig.getInstance().shakeFromSheep; return TreasureConfig.getInstance().shakeFromSheep;
case SHULKER:
return TreasureConfig.getInstance().shakeFromShulker;
case SKELETON: case SKELETON:
return TreasureConfig.getInstance().shakeFromSkeleton; return TreasureConfig.getInstance().shakeFromSkeleton;

11
src/main/resources/treasures.yml
View File

@ -811,6 +811,17 @@ Shake:
XP: 0 XP: 0
Drop_Chance: 100.0 Drop_Chance: 100.0
Drop_Level: 0 Drop_Level: 0
SHULKER:
SHULKER_SHELL:
Amount: 1
XP: 0
Drop_Chance: 25.0
Drop_Level: 0
PURPUR_BLOCK:
Amount: 1
XP: 0
Drop_Chance: 75.0
Drop_Level: 0
SKELETON: SKELETON:
SKULL_ITEM: SKULL_ITEM:
Data: 0 Data: 0