mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-22 21:26:46 +01:00
Make it possible to shake heads from players
This commit is contained in:
parent
3422c5d3eb
commit
d188224c06
@ -57,6 +57,7 @@ public class TreasureConfig extends ConfigLoader {
|
|||||||
public List<ShakeTreasure> shakeFromMushroomCow = new ArrayList<ShakeTreasure>();
|
public List<ShakeTreasure> shakeFromMushroomCow = new ArrayList<ShakeTreasure>();
|
||||||
public List<ShakeTreasure> shakeFromPig = new ArrayList<ShakeTreasure>();
|
public List<ShakeTreasure> shakeFromPig = new ArrayList<ShakeTreasure>();
|
||||||
public List<ShakeTreasure> shakeFromPigZombie = new ArrayList<ShakeTreasure>();
|
public List<ShakeTreasure> shakeFromPigZombie = 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> 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>();
|
||||||
@ -353,6 +354,9 @@ public class TreasureConfig extends ConfigLoader {
|
|||||||
else if (type.equals("Shake.PIG_ZOMBIE")) {
|
else if (type.equals("Shake.PIG_ZOMBIE")) {
|
||||||
shakeFromPigZombie.add(shakeTreasure);
|
shakeFromPigZombie.add(shakeTreasure);
|
||||||
}
|
}
|
||||||
|
else if (type.equals("Shake.PLAYER")) {
|
||||||
|
shakeFromPlayer.add(shakeTreasure);
|
||||||
|
}
|
||||||
else if (type.equals("Shake.SHEEP")) {
|
else if (type.equals("Shake.SHEEP")) {
|
||||||
shakeFromSheep.add(shakeTreasure);
|
shakeFromSheep.add(shakeTreasure);
|
||||||
}
|
}
|
||||||
|
@ -110,6 +110,9 @@ public final class Fishing {
|
|||||||
case PIG_ZOMBIE:
|
case PIG_ZOMBIE:
|
||||||
return TreasureConfig.getInstance().shakeFromPigZombie;
|
return TreasureConfig.getInstance().shakeFromPigZombie;
|
||||||
|
|
||||||
|
case PLAYER:
|
||||||
|
return TreasureConfig.getInstance().shakeFromPlayer;
|
||||||
|
|
||||||
case SHEEP:
|
case SHEEP:
|
||||||
return TreasureConfig.getInstance().shakeFromSheep;
|
return TreasureConfig.getInstance().shakeFromSheep;
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@ import org.bukkit.entity.TNTPrimed;
|
|||||||
import org.bukkit.entity.ThrownPotion;
|
import org.bukkit.entity.ThrownPotion;
|
||||||
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.inventory.meta.SkullMeta;
|
||||||
import org.bukkit.material.Wool;
|
import org.bukkit.material.Wool;
|
||||||
import org.bukkit.potion.Potion;
|
import org.bukkit.potion.Potion;
|
||||||
import org.bukkit.potion.PotionType;
|
import org.bukkit.potion.PotionType;
|
||||||
@ -393,6 +394,23 @@ public class FishingManager extends SkillManager {
|
|||||||
|
|
||||||
// Extra processing depending on the mob and drop type
|
// Extra processing depending on the mob and drop type
|
||||||
switch (target.getType()) {
|
switch (target.getType()) {
|
||||||
|
case PLAYER:
|
||||||
|
Player targetPlayer = (Player) target;
|
||||||
|
|
||||||
|
switch (drop.getType()) {
|
||||||
|
case SKULL_ITEM:
|
||||||
|
drop.setDurability((short) 3);
|
||||||
|
SkullMeta skullMeta = (SkullMeta) drop.getItemMeta();
|
||||||
|
skullMeta.setOwner(targetPlayer.getName());
|
||||||
|
drop.setItemMeta(skullMeta);
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case SHEEP:
|
case SHEEP:
|
||||||
Sheep sheep = (Sheep) target;
|
Sheep sheep = (Sheep) target;
|
||||||
|
|
||||||
|
@ -793,6 +793,12 @@ Shake:
|
|||||||
XP: 0
|
XP: 0
|
||||||
Drop_Chance: 50.0
|
Drop_Chance: 50.0
|
||||||
Drop_Level: 0
|
Drop_Level: 0
|
||||||
|
PLAYER:
|
||||||
|
SKULL_ITEM:
|
||||||
|
Amount: 1
|
||||||
|
XP: 0
|
||||||
|
Drop_Chance: 0.0
|
||||||
|
Drop_Level: 0
|
||||||
SHEEP:
|
SHEEP:
|
||||||
WOOL:
|
WOOL:
|
||||||
Amount: 3
|
Amount: 3
|
||||||
|
Loading…
Reference in New Issue
Block a user